Diffusion Krita d63b73122647

Merge branch 'master' into rempt/T1625-python-scripting
d63b73122647
Actions

Authored by rempt on Oct 4 2016, 6:52 AM.

Description

Merge branch 'master' into rempt/T1625-python-scripting

Details

Committed

rempt

Oct 4 2016, 6:52 AM

Parents

R37:f63a23c8891c: Add drmingw to the Windows build
R37:de6cedcb6fde: Merge branch 'master' into berger-scripting

Branches

Unknown

Tags

Unknown

rempt committed R37:d63b73122647: Merge branch 'master' into rempt/T1625-python-scripting (authored by rempt).Oct 4 2016, 6:52 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit		Author	Details	Committed
f63a23c8891c		rempt	Add drmingw to the Windows build	Oct 3 2016
ac04c5599bd2		rempt	Make it possible to build boost without msvc installed	Oct 3 2016
fe27d756f924		rempt	We will call the next stable release 3.1, not 3.0.1	Oct 3 2016
41f23200700c		rempt	Add the removable media plugin	Oct 3 2016
80df6a7ee289		rempt	Check whether there is projection before trying to do stuff to it	Oct 3 2016
ea6dacc6117a		dkazakov	Fix alignment of the selection size values	Oct 3 2016
bdeb9d94382f		rempt	use dbgFile to print the ffmpeg command line	Oct 3 2016
e628e52e7b62		rempt	Try to find the ffmpeg binary	Oct 3 2016
8d8d7495ffc4		rempt	Add bigger icons for OSX	Oct 3 2016
fcea2ec8ed1e		rempt	BUG:369574 Fix crash with animation curves	Oct 3 2016
b2eb88ff7eee		woltherav	Make transparency in the gradient map filter work a little better.	Oct 1 2016
70444c95a4f8		woltherav	Prevent half-painted dots where they don't belong.	Oct 1 2016
f3dc182b867d		woltherav	Make haltone filter respect transparency as well	Oct 1 2016
0e724d5270df		woltherav	Be mindful of the transparency when doing the halftone filter.	Oct 1 2016
dea6d1648b82		woltherav	Save the current color to the config and make the pop-up palette use the color…	Oct 1 2016
4e3002750320		dkazakov	Fix translation transform handle the anchor points!	Sep 29 2016
edfddf153d3d		dkazakov	Prevent transform handles from doing belly dance while doing transformation	Sep 29 2016
10af108790a2		pkouame	Merge branch 'master' into autosave-recovery	Sep 29 2016
32a605b44c94		pkouame	Fix autosave recovery bug (on macOS?) KDE BUG #367610	Sep 29 2016
cc63ae3adb23		fazek	patch D2822: mouse wheel support for the animation timeline	Sep 29 2016
044694c89b35		timotheegiet	small consistency edit	Sep 28 2016
a4ea3c9dcedf		jounip	Fix crash when copying a frame to time 0	Sep 28 2016
de254471e6e0		pino	fixuifiles	Sep 28 2016
8fa405207dac		rempt	Get rid of all the QObject::connect: invalid null parameter messages	Sep 28 2016
2fef69c8ac53		rempt	Add Alvin's new packaging script	Sep 28 2016
2bce29d7d05a		rempt	Update the script	Sep 28 2016
df0254d6c31f		rempt	Remove the git revision from the version string	Sep 28 2016
c25849e27ddc		timotheegiet	add some default Quick Brush presets	Sep 27 2016
5e56d1a750ed		rempt	Get ki18n 17 from the attic	Sep 27 2016
023cf90cccf5		rempt	enginio is gone	Sep 27 2016
29b565f2a2eb		rempt	Update snap to 3.0.1.1	Sep 27 2016
7c627a73cc1c		rempt	Merge branch 'master' into kazakov/preset-chooser-fixes	Sep 27 2016
4e33762dd3c1		rempt	Update version number	Sep 27 2016
5abe4aa1de3b	D2856	rempt	Improve build support with more mingw-w64 versions on Windows	Sep 27 2016
f34807099d74		l10n daemon script	SVN_SILENT made messages (after extraction)	Sep 27 2016
f1657cb30207		nishantjr	Undo rename of KisGrbBrush	Sep 26 2016
cfe6db398026		dkazakov	Disable explicit delay before updating the colorize mask	Sep 23 2016
fa50ff82c5e4		dkazakov	Don't use asserts. Neither in boost nor in our graph code	Sep 23 2016
9a6cdd262488		dkazakov	Don't use Q_FOREACH in hot places	Sep 23 2016
5e6cfa3136d9		dkazakov	Never use QRect::contains() for bottle-neck algorithms!	Sep 23 2016
20cff6bbc87d		dkazakov	Make graph edge capacity be of integer type	Sep 23 2016
1e3282d4be1d		dkazakov	Optimize Lazy Fill for the transparent background area	Sep 23 2016
be8cc320edab		dkazakov	Optimize Boost's BK algorithm	Sep 23 2016
37d0dd74c53d		dkazakov	Fork Boykov-Kolmogorov algorithm from boost	Sep 23 2016
84fe0d80ece2		dkazakov	Fix the tablet-no-pressure bug when closing the brush editor	Sep 22 2016
48b744731c4b		dkazakov	Fixed memory leaks when creating Colorize Masks	Sep 22 2016
91dc269c6fcd		dkazakov	Avoid visual glitch when painting on the colorize mask	Sep 22 2016
ad689f117d53		dkazakov	Fixed an update glitch in the Colorize Mask	Sep 22 2016
0571f3df18ea		dkazakov	Convert the memory leak assert into a safe assert	Sep 21 2016
62ad2e3ec438		dkazakov	Fix memory leak when Cumulative Undo is turned on	Sep 21 2016

Changes (120)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		3rdparty/CMakeLists.txt
M		3rdparty/ext_boost/CMakeLists.txt
A	(dir)	3rdparty/ext_drmingw/
A		3rdparty/ext_drmingw/CMakeLists.txt
M		3rdparty/ext_fftw3/CMakeLists.txt
M		3rdparty/ext_frameworks/CMakeLists.txt
M		3rdparty/ext_poppler/CMakeLists.txt
A		3rdparty/ext_poppler/poppler_mingw.patch
M		3rdparty/ext_qt/CMakeLists.txt
M		CMakeLists.txt
M		KoConfig.h.cmake
M		krita/CMakeLists.txt
M		krita/Info.plist.template
M		krita/data/paintoppresets/CMakeLists.txt
A		krita/data/paintoppresets/Quick_circle_big.kpp
A		krita/data/paintoppresets/Quick_circle_huge.kpp
A		krita/data/paintoppresets/Quick_circle_layout.kpp
M		krita/main.cc
M		krita/org.kde.krita.appdata.xml
A	(dir)	krita/pics/mimetypes/1024/
A		krita/pics/mimetypes/1024/application-x-krita.png
A	(dir)	krita/pics/mimetypes/256/
A		krita/pics/mimetypes/256/application-x-krita.png
A	(dir)	krita/pics/mimetypes/512/
A		krita/pics/mimetypes/512/application-x-krita.png
M		libs/brush/CMakeLists.txt
M		libs/brush/kis_brush_server.cpp
V		libs/brush/{kis_gbr_brush.cpp ← kis_gimp_brush.cpp}
V		libs/brush/{kis_gbr_brush.h ← kis_gimp_brush.h}
V		libs/brush/{kis_gimp_brush.cpp → kis_gbr_brush.cpp}
V		libs/brush/{kis_gimp_brush.h → kis_gbr_brush.h}
M		libs/brush/kis_imagepipe_brush.cpp
M		libs/brush/kis_imagepipe_brush.h
M		libs/brush/kis_predefined_brush_factory.cpp
M		libs/brush/kis_qimage_pyramid.cpp
M		libs/brush/kis_qimage_pyramid.h
M		libs/brush/kis_text_brush.cpp
M		libs/brush/tests/CMakeLists.txt
V		libs/brush/tests/{kis_gbr_brush_test.cpp ← kis_gimp_brush_test.cpp}
V		libs/brush/tests/{kis_gbr_brush_test.h ← kis_gimp_brush_test.h}
V		libs/brush/tests/{kis_gimp_brush_test.cpp → kis_gbr_brush_test.cpp}
V		libs/brush/tests/{kis_gimp_brush_test.h → kis_gbr_brush_test.h}
M		libs/brush/tests/kis_imagepipe_brush_test.cpp
M		libs/image/kis_command_utils.h
M		libs/image/kis_indirect_painting_support.cpp
M		libs/image/kis_indirect_painting_support.h
M		libs/image/kis_layer.cc
M		libs/image/kis_layer_utils.h
M		libs/image/kis_mask.cc
M		libs/image/kis_mask.h
M		libs/image/kis_paint_device.cc
M		libs/image/kis_raster_keyframe_channel.cpp
M		libs/image/lazybrush/kis_colorize_mask.cpp
M		libs/image/lazybrush/kis_colorize_mask.h
M		libs/image/lazybrush/kis_lazy_fill_capacity_map.h
M		libs/image/lazybrush/kis_lazy_fill_graph.h
M		libs/image/lazybrush/kis_lazy_fill_tools.cpp
M		libs/image/lazybrush/kis_multiway_cut.cpp
A		libs/image/lazybrush/patched_boykov_kolmogorov_max_flow.hpp
M		libs/image/tests/kis_keyframing_test.cpp
M		libs/image/tests/kis_keyframing_test.h
M		libs/image/tests/kis_lazy_brush_test.cpp
M		libs/image/tests/kis_lazy_brush_test.h
M		libs/koplugin/KoJsonTrader.cpp
M		libs/kundo2/kundo2stack.cpp
M		libs/ui/KisApplication.cpp
M		libs/ui/KisApplication.h
M		libs/ui/KisDocument.cpp
M		libs/ui/KisViewManager.cpp
M		libs/ui/input/wintab/kis_tablet_support_win.cpp
M		libs/ui/input/wintab/qxcbconnection.cpp
M		libs/ui/input/wintab/qxcbconnection_xi2.cpp
M		libs/ui/input/wintab/qxcbconnection_xi2.h
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_favorite_resource_manager.cpp
M		libs/ui/kis_mask_manager.cc
M		libs/ui/kis_paintop_box.cc
M		libs/ui/kis_popup_palette.cpp
M		libs/ui/kra/kis_kra_loader.cpp
M		libs/ui/tests/kis_kra_saver_test.cpp
M		libs/ui/tool/kis_tool_rectangle_base.cpp
M		libs/ui/widgets/kis_paintop_presets_chooser_popup.cpp
M		libs/ui/widgets/kis_paintop_presets_chooser_popup.h
M		libs/ui/widgets/kis_paintop_presets_popup.cpp
M		libs/ui/widgets/kis_paintop_presets_popup.h
M		libs/ui/widgets/kis_preset_chooser.cpp
M		libs/ui/widgets/kis_preset_chooser.h
M		libs/widgets/KoResourceItemChooser.cpp
M		libs/widgets/KoResourceItemChooser.h
M		libs/widgets/KoResourceItemView.cpp
M		libs/widgets/KoResourceItemView.h
M		libs/widgets/KoResourceModel.cpp
M		libs/widgets/KoResourceServerAdapter.h
M		packaging/linux/snap/snapcraft.yaml
M		packaging/windows/makepkg-32.sh
A		packaging/windows/package_2.cmd
M		plugins/dockers/animation/kis_animation_curves_model.cpp
M		plugins/dockers/animation/kis_time_based_item_model.cpp
M		plugins/dockers/animation/timeline_frames_view.cpp
M		plugins/dockers/animation/timeline_frames_view.h
M		plugins/dockers/animation/wdg_animation_curves.ui
M		plugins/dockers/defaultdockers/kis_layer_box.cpp
M		plugins/dockers/presetdocker/presetdocker_dock.cpp
M		plugins/extensions/animationrenderer/DlgAnimationRenderer.cpp
M		plugins/extensions/animationrenderer/DlgAnimationRenderer.h
M		plugins/filters/gradientmap/krita_filter_gradient_map.cpp
M		plugins/filters/halftone/kis_halftone_filter.cpp
M		plugins/impex/brush/kis_brush_export.cpp
M		plugins/impex/brush/kis_brush_import.cpp
M		plugins/impex/video/video_saver.cpp
M		plugins/paintops/libpaintop/kis_brush_chooser.cpp
M		plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
M		plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
M		plugins/tools/basictools/kis_tool_move.cc
M		plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
M		plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
M		plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
M		plugins/tools/tool_transform2/kis_transform_utils.cpp
M		plugins/tools/tool_transform2/kis_transform_utils.h