Diffusion Krita 94dd51758949

Merge remote-tracking branch 'origin/master' into krita-lazybrush-kazakov

Authored by dkazakov on Sep 12 2016, 2:59 PM.

Description

Merge remote-tracking branch 'origin/master' into krita-lazybrush-kazakov

  1. Conflicts:
  2. libs/image/kis_painter.cc

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
2927543bef67rempt
Fix memory leak: delete the display filter if we own it. 
Sep 12 2016
deff966ee304rempt
Fix a memory leak: the popup action should "own" the image collection 
Sep 12 2016
7d0975458542rempt
Merge branch 'video-export-rebased' 
Sep 12 2016
b00b2316df70rempt
Make the destructor virtual 
Sep 12 2016
30304b76a608rempt
Sort the contents of a KisCmbIDList 
Sep 12 2016
b6d238cfaba9rempt
Fix a few uninitialized variables memcheck warnings 
Sep 12 2016
81116bf10699akapustin
Merge branch 'master' and akapustin/stroke_selection 
Sep 12 2016
8ff4f1f93a61dkazakov
Rename new layer from "Visible Layer" into just "Visible" 
Sep 12 2016
6a54b1faefc7D2428miroslavtalasek/dkazakov
New Layer from visible 
Sep 12 2016
2ac3c47e3ba9rempt
BUG:368624 Add mesa-libglu-devel 
Sep 12 2016
fe518206866arempt
Update the script to create the tarball for centos users 
Sep 12 2016
86acf52509a5rempt
BUG:368648 Do not deadlock while loading this image 
Sep 12 2016
37021e4baa26rempt
Note a few places where we _really_ need apidox 
Sep 12 2016
ad5be6afefbarempt
Fix Windows build: globally include boost 
Sep 12 2016
0bd72bc796e9D2734rempt
Fix "not declared in this scope" compile errors in Windows 
Sep 12 2016
f859c9fcc165D2736rempt
Fix "undefined referenced to..." compile errors from KoDualColorButton in… 
Sep 12 2016
6f2f7e9e881drempt
Build using the right os and display on Windows 
Sep 12 2016
c18aa82f80b6rempt
Don't lock the options button for the frame export format 
Sep 12 2016
483ab6ab4040rempt
Merge remote-tracking branch 'origin' into video-export-rebased 
Sep 9 2016
a91bc866c6a8rempt
Fix setting the codec based on the mimetype 
Sep 5 2016
7b13d14c53f7rempt
Put the config pages in popup dialogs 
Sep 5 2016
0a512b449d84rempt
Merge remote-tracking branch 'origin' into video-export-rebased 
Sep 1 2016
cced0ca9e4b6rempt
Remove the magic USER_CANCELED string 
Sep 1 2016
48e3929f838bD2302akapustin
Add Stroke Selection Edge function 
Aug 30 2016
b248b2c0921crempt
Merge branch 'master' into video-export-rebased 
Aug 25 2016
e597a9d396f9rempt
Merge branch 'master' into video-export-rebased 
Aug 20 2016
a6a2407a19c6rempt
Remove some unused includes 
Aug 16 2016
189daca58291rempt
Save to a temporary file, then copy the result over on success 
Aug 16 2016
3967312617adrempt
Merge branch 'master' into video-export-rebased 
Aug 16 2016
25c03b42b422rempt
Merge remote-tracking branch 'origin' into video-export-rebased 
Aug 6 2016
bd7df341dac9rempt
Remove test -- the plugin no longer works like this. 
Aug 5 2016
66f7da2f89eerempt
Fix some more unittests 
Aug 5 2016
f6cea7ad22d0rempt
Fix some more unittests 
Aug 5 2016
f6530e47d72crempt
Fix the KisPropertiesConfiguration test 
Aug 5 2016
d792ee4735e6rempt
Store and restore all the dialog settings 
Aug 4 2016
287a3f775982rempt
Let the video saver work when called with a configuration 
Aug 4 2016
36550e851744rempt
Merge remote-tracking branch 'origin' into video-export-rebased 
Aug 4 2016
080352e0062frempt
Render the frames and call the ffmpeg converter 
Aug 3 2016
23f7e4996130rempt
Append, not replace the path on Windows 
Aug 3 2016
63b01568fe18rempt
Remove empty string 
Aug 3 2016
feb1a29c504crempt
be less verbose 
Aug 3 2016
6767fdc735bbrempt
Fix whitespace 
Aug 3 2016
cac976753e9erempt
Set the default file type 
Aug 3 2016
1662b3c02979rempt
Fix whitespace 
Aug 3 2016
8f5fed2f0fa5rempt
Also warn if the filename to render to is empty. 
Aug 3 2016
5b9848421980rempt
Set the mimetypes for the rendered file selector 
Aug 3 2016
9f20286bf90drempt
Add a field to enter the location of ffmpeg 
Aug 3 2016
ddf3a8010983rempt
Revert "Move the video export files to the animation renderer plugin" 
Aug 3 2016
c44fd65384bbrempt
Merge branch 'master' into video-export-rebased 
Aug 2 2016
fc1d4dce1c12rempt
Move the video export files to the animation renderer plugin 
Aug 1 2016