Diffusion Krita 6ea2ee0b4410

Merge branch 'master' into animation-pentikainen

Authored by jounip on Sep 18 2016, 3:48 PM.

Description

Merge branch 'master' into animation-pentikainen

Conflicts:
krita/pics/svg/svg-icons.qrc
libs/image/kis_base_node.h
libs/image/kis_image_config.cpp
libs/image/kis_image_config.h
libs/ui/KisDocument.cpp
plugins/dockers/animation/onion_skins_docker.ui

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
0397774143eerempt
Apply Beuc's patches to the appimage build script 
Sep 17 2016
04115f1c3062dkazakov
Fix warning 
Sep 16 2016
79ec1add22cbdkazakov
Fix wrong parameters in memset in Sobel Filter 
Sep 16 2016
47e8ee0294cedkazakov
Fix crash when copying the image with Instant Preview active 
Sep 16 2016
60aaefc9bc62dkazakov
Implement instant preview for Colorize Mask 
Sep 16 2016
efe88124aceadkazakov
Fix crash when using Colorize Mask with Instant Preview active 
Sep 16 2016
edcbbed0f0f9dkazakov
Remove a sanity check assert 
Sep 16 2016
7a5ff5523562dkazakov
Update default preset for the RoundMarker brush to make it faster 
Sep 16 2016
d3a8b2716e77dkazakov
Remove forgotten comment :) 
Sep 16 2016
5bbc507b8da1dkazakov
Remove the loop in updating the paintop editor 
Sep 16 2016
ee3a2e0979b9dkazakov
Fix copy-paste error that prevented clone brush from normal work 
Sep 16 2016
855644489dbadkazakov
Merge remote-tracking branch 'origin/master' into kazakov/shift-gesture-slowdown 
Sep 16 2016
f0c1171bee2dwoltherav
Try changing include, for the second file... 
Sep 15 2016
a7db07470613woltherav
Change QtTest include, perhaps it is confusing jenkins 
Sep 15 2016
7ae543b70a1fdkazakov
Forbid conversion of KisPaintOpSettingsSP into raw pointer 
Sep 15 2016
2cf1daeb47c4rempt
Disable the async merger test for now 
Sep 15 2016
504dcd42bac7rempt
Update 
Sep 15 2016
0d4671991b70Nim
Merge branch 'master' of git://anongit.kde.org/krita 
Sep 15 2016
965711787e84dkazakov
Fix potentially dangerous passing of 'this' into uniform properties 
Sep 15 2016
b11f32527a99Nim
Allow Level of Detail to function with OpenGL 3.0 
Sep 15 2016
f1d01ccf3fdcrempt
BUG:365400 Don't crash when merging layers gives an inconsistent result 
Sep 15 2016
6d10441728cerempt
Simplify the sobel filter and disable Make Opaque 
Sep 15 2016
338478360b22dkazakov
Fix locked properties proxy not to use shared pointers for parent settings 
Sep 15 2016
390015d9b5d8rempt
BUG:368721 Make the sobel filter work if topleft != 0,0 
Sep 15 2016
29669573ae64dkazakov
Make it compile and run again! 
Sep 15 2016
ae14b6526947dkazakov
Avoid warnings for unused variables 
Sep 15 2016
77fc478669bedkazakov
Merge remote-tracking branch 'origin/master' into kazakov/shift-gesture-slowdown 
Sep 15 2016
429419275033rempt
BUG:368824 Do not deleted a shared pointer 
Sep 15 2016
6c9f819ea3bcrempt
Fix build... 
Sep 15 2016
ce14644e51darempt
debug-- 
Sep 15 2016
694980520177rempt
Skip malformed credit entries in the abouttbox 
Sep 15 2016
adbd8f99d0eedkazakov
Fix OCIO display filter test 
Sep 14 2016
b7b66342db17rempt
Hack: only look for templates in folders that contain the word "templates" 
Sep 14 2016
0e6db278ae14rempt
BUG:368764 Manage the display filters with shared pointers 
Sep 14 2016
529f24faf18bpino
fixuifiles 
Sep 14 2016
461e57772810yurchor
Fix minor typo 
Sep 13 2016
e0d9a4feba0drempt
Ask for 3.0 on platforms other than osx 
Sep 13 2016
73fe154c55c3Nim
Added legacy cursor shaders to resource file 
Sep 13 2016
d555b47fa32erempt
Fix painting with the hatching brush 
Sep 13 2016
8a14d6338615dkazakov
Merge remote-tracking branch 'origin/master' into kazakov/round-marker 
Sep 13 2016
bf2a65647c81dkazakov
Merge remote-tracking branch 'origin/master' into kazakov/round-marker 
Sep 13 2016
0280aa780497D2755Nim
Patch Qt on OSX for fixing the opengl qpainter engine 
Sep 13 2016
f957071546c8rempt
BUG:368747 Fix regression in the hatching paintop 
Sep 13 2016
17bded7d752aD2755Nim
Merge branch 'nimmy/opengl-patch' of git://anongit.kde.org/krita into… 
Sep 13 2016
5bcd9f18ad46rempt
Fix regression in the sketch brush 
Sep 13 2016
5f917be3bd92rempt
BUG:368727 Don't crash on using the scratchpad 
Sep 13 2016
a5a46bf2069drempt
Sort the assistants combobox 
Sep 13 2016
7e7c4b55e41arempt
Warning-- 
Sep 13 2016
867946cca46frempt
warning-- 
Sep 13 2016
42048713623erempt
warning-- 
Sep 13 2016

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.