Diffusion Krita 3fdbde5a5afb

Merge branch 'master' into rempt/intel-3
3fdbde5a5afb
Actions

Authored by rempt on Mar 14 2018, 1:25 PM.

Description

Merge branch 'master' into rempt/intel-3

Details

Committed

rempt

Mar 14 2018, 1:25 PM

Parents

R37:e9b0661657f6: Create actions per-window instead of per-application
R37:d357a90add1d: Merge remote-tracking branch 'origin' into rempt/intel-3

Branches

Unknown

Tags

Unknown

rempt committed R37:3fdbde5a5afb: Merge branch 'master' into rempt/intel-3 (authored by rempt).Mar 14 2018, 1:25 PM

Merged Changes

Commit	Author	Details	Committed
e9b0661657f6	rempt	Create actions per-window instead of per-application	Mar 14 2018
aeb753e41d1a	dkazakov	Fix animation cache regeneration being stuck in the middle of recalculation	Mar 14 2018
ab523d80132e	rempt	Fix loading the action plugins in new windows	Mar 14 2018
9659c19fe1cf	rempt	fix whitespace	Mar 14 2018
f895420e4aa4	rempt	Hide the viewManager member from subclasses and use getter instead	Mar 14 2018
dec6be30f9e8	dkazakov	Transform Tool: keep anchor lock when "Leep Aspect Ratio" is selected	Mar 14 2018
e443dc644943	rempt	Rename KisViewPlugin to KisActionPlugin	Mar 14 2018
f4156907a4e8	rempt	Remove unused code	Mar 13 2018
4d4f6ddebe40	woltherav	Disable disable code in png export dialog for now.	Mar 13 2018
c38406423bba	rempt	remove spurious warning	Mar 13 2018
581d1379bcb2	rempt	Set the maximum values for width and height to 100000000.000000	Mar 13 2018
28a1a7750cca	woltherav	Animation Renderer: Allow max frame the same as last frame in animation docker.	Mar 12 2018
3e3e7a3f52f8	woltherav	CPMT:Fix loading author data.	Mar 12 2018
41bda76d8d82	woltherav	CPMT: Create styledItemDelegate for the page viewer to reduce dnd fiddliness.	Mar 12 2018
27c660c0bbfc	dkazakov	Fix LoD being activated for everything, even for brushes that do not support it	Mar 12 2018
a41aeb7b39f6	dkazakov	Fix update of the mask projection on a layer above a layer with transformation…	Mar 12 2018
cd36b534abae	rempt	Try even harder to keep the Krita 3 bundle out of the regular blacklist	Mar 12 2018
307f5723d559	dkazakov	Fix resetting LoD options when changing the brush settings	Mar 12 2018
4e9d403738a9	rempt	Fix comparing colors if fuzziness is 1	Mar 12 2018
d0e6714b85f8	woltherav	Default to 'baseline', 'high422' can cause black video on windows.	Mar 11 2018

Changes (115)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			krita/krita4.xmlgui
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/image/brushengine/kis_paintop_settings.h
	M			libs/image/floodfill/kis_scanline_fill.cpp
	M			libs/image/kis_merge_walker.cc
	M			libs/image/kis_merge_walker.h
	M			libs/image/kis_paint_device.cc
	M			libs/libkis/Action.cpp
	M			libs/libkis/Action.h
	M			libs/libkis/Extension.h
	M			libs/libkis/Krita.cpp
	M			libs/libkis/Krita.h
	M			libs/libkis/Mainpage.dox
	M			libs/libkis/Window.cpp
	M			libs/libkis/Window.h
	M			libs/ui/CMakeLists.txt
	V			libs/ui/{KisActionPlugin.cpp ← kis_view_plugin.cpp}
	V			libs/ui/{KisActionPlugin.h ← kis_view_plugin.h}
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPart.cpp
	M			libs/ui/KisPart.h
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/KisViewManager.h
	M			libs/ui/dialogs/KisAsyncAnimationCacheRenderDialog.cpp
	M			libs/ui/dialogs/KisAsyncAnimationCacheRenderDialog.h
	M			libs/ui/dialogs/KisAsyncAnimationFramesSaveDialog.cpp
	M			libs/ui/dialogs/KisAsyncAnimationFramesSaveDialog.h
	M			libs/ui/dialogs/KisAsyncAnimationRenderDialogBase.cpp
	M			libs/ui/dialogs/KisAsyncAnimationRenderDialogBase.h
	M			libs/ui/kis_canvas_resource_provider.h
	M			libs/ui/kis_paintop_box.cc
	D			libs/ui/kis_script_manager.cpp
	D			libs/ui/kis_script_manager.h
	V			libs/ui/{kis_view_plugin.cpp → KisActionPlugin.cpp}
	V			libs/ui/{kis_view_plugin.h → KisActionPlugin.h}
	M			libs/ui/tool/kis_resources_snapshot.cpp
	M			libs/ui/widgets/kis_lod_availability_widget.cpp
	M			libs/widgets/KoResourceServer.h
	M			libs/widgets/KoResourceServerProvider.cpp
	M			plugins/dockers/throttle/ThrottlePlugin.h
	M			plugins/extensions/animationrenderer/AnimationRenderer.cpp
	M			plugins/extensions/animationrenderer/AnimationRenderer.h
	M			plugins/extensions/animationrenderer/wdg_animationrenderer.ui
	M			plugins/extensions/bigbrother/bigbrother.cc
	M			plugins/extensions/bigbrother/bigbrother.h
	M			plugins/extensions/buginfo/buginfo.cpp
	M			plugins/extensions/buginfo/buginfo.h
	M			plugins/extensions/clonesarray/clonesarray.cpp
	M			plugins/extensions/clonesarray/clonesarray.h
	M			plugins/extensions/clonesarray/dlg_clonesarray.cpp
	M			plugins/extensions/clonesarray/dlg_clonesarray.h
	M			plugins/extensions/colorrange/colorrange.cc
	M			plugins/extensions/colorrange/colorrange.h
	M			plugins/extensions/colorrange/dlg_colorrange.cc
	M			plugins/extensions/colorrange/dlg_colorrange.h
	M			plugins/extensions/colorspaceconversion/colorspaceconversion.cc
	M			plugins/extensions/colorspaceconversion/colorspaceconversion.h
	M			plugins/extensions/histogram/histogram.cc
	M			plugins/extensions/histogram/histogram.h
	M			plugins/extensions/imagesize/imagesize.cc
	M			plugins/extensions/imagesize/imagesize.h
	M			plugins/extensions/imagesize/wdg_canvassize.ui
	M			plugins/extensions/imagesize/wdg_imagesize.ui
	M			plugins/extensions/imagesize/wdg_layersize.ui
	M			plugins/extensions/imagesplit/imagesplit.cpp
	M			plugins/extensions/imagesplit/imagesplit.h
	M			plugins/extensions/layergroupswitcher/layergroupswitcher.cpp
	M			plugins/extensions/layergroupswitcher/layergroupswitcher.h
	M			plugins/extensions/layersplit/layersplit.cpp
	M			plugins/extensions/layersplit/layersplit.h
	M			plugins/extensions/metadataeditor/metadataeditor.cc
	M			plugins/extensions/metadataeditor/metadataeditor.h
	M			plugins/extensions/modify_selection/modify_selection.cc
	M			plugins/extensions/modify_selection/modify_selection.h
	M			plugins/extensions/offsetimage/offsetimage.cpp
	M			plugins/extensions/offsetimage/offsetimage.h
	M			plugins/extensions/pykrita/plugin/kritapykrita.json
	M			plugins/extensions/pykrita/plugin/plugin.cpp
	M			plugins/extensions/pykrita/plugin/plugin.h
	M			plugins/extensions/pykrita/sip/krita/Action.sip
	M			plugins/extensions/pykrita/sip/krita/Extension.sip
	M			plugins/extensions/pykrita/sip/krita/Krita.sip
	M			plugins/extensions/pykrita/sip/krita/Window.sip
	M			plugins/extensions/qmic/QMic.cpp
	M			plugins/extensions/qmic/QMic.h
	M			plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
	M			plugins/extensions/resourcemanager/resourcemanager.cpp
	M			plugins/extensions/resourcemanager/resourcemanager.h
	M			plugins/extensions/rotateimage/rotateimage.cc
	M			plugins/extensions/rotateimage/rotateimage.h
	M			plugins/extensions/separate_channels/kis_channel_separator.cc
	M			plugins/extensions/separate_channels/kis_channel_separator.h
	M			plugins/extensions/separate_channels/kis_separate_channels_plugin.cc
	M			plugins/extensions/separate_channels/kis_separate_channels_plugin.h
	M			plugins/extensions/shearimage/shearimage.cc
	M			plugins/extensions/shearimage/shearimage.h
	M			plugins/extensions/waveletdecompose/waveletdecompose.cpp
	M			plugins/extensions/waveletdecompose/waveletdecompose.h
	M			plugins/impex/png/kis_png_export.cc
	M			plugins/impex/video/kis_video_export.cpp
	M			plugins/impex/video/video_export_options_dialog.cpp
	M			plugins/python/assignprofiledialog/assignprofiledialog.py
	M			plugins/python/colorspace/colorspace.py
	M			plugins/python/comics_project_management_tools/README.html
	M			plugins/python/comics_project_management_tools/comics_project_manager_docker.py
	M			plugins/python/documenttools/documenttools.py
	M			plugins/python/exportlayers/exportlayers.py
	M			plugins/python/filtermanager/filtermanager.py
	M			plugins/python/hello/hello.py
	M			plugins/python/highpass/highpass.py
	M			plugins/python/scripter/scripter.py
	M			plugins/python/tenbrushes/tenbrushes.py
	M			plugins/python/tenscripts/tenscripts.py
	M			plugins/tools/selectiontools/kis_tool_select_similar.cc
	M			plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp