animation-cache…
68eb19562e2e
Actions

Authored by dkazakov on May 31 2018, 9:46 AM.

Description

Merge remote-tracking branch 'origin/master' into kazakov/animation-cache-swapping

Conflicts:
libs/flake/KoShape.cpp
libs/ui/CMakeLists.txt
libs/ui/KisCloneDocumentStroke.cpp
libs/ui/dialogs/kis_dlg_preferences.cc

Details

Committed

dkazakov

May 31 2018, 9:46 AM

Parents

R37:c700ea3e0951: Implement GUI options for all the new Animation Cache features
R37:ea2042a7ce0d: Merge branch 'master' of https://anongit.kde.org/krita

Branches

Unknown

Tags

Unknown

dkazakov committed R37:68eb19562e2e: Merge remote-tracking branch 'origin/master' into kazakov/animation-cache… (authored by dkazakov).May 31 2018, 9:46 AM

Merged Changes

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

Commit		Author	Details	Committed
ea2042a7ce0d		mzhou	Merge branch 'master' of https://anongit.kde.org/krita	May 31 2018
ffc576e09cb3	D13208	mzhou	Forgot to add the new files...	May 31 2018
ad2b99789b2e		mzhou	Forgot to add the new files... Differential Revision: https://phabricator.kde.	May 31 2018
8b04bbc98927		mzhou	Merge branch 'master' of https://anongit.kde.org/krita	May 31 2018
9570d827ecc5		mzhou	Changed KisColorSetEntry to be a class from a struct Differential revision…	May 31 2018
df4cb29add28		vanyossi/rempt	FIX: Missing Antialias on Vectorized Circular Gauss	May 31 2018
13f524919151		l10n daemon script	GIT_SILENT made messages (after extraction)	May 31 2018
f40febacdf66		rempt	Put KisApplication's d-pointer in a QScopedPointer	May 30 2018
eb3afe6d6530		rempt	Fix typo	May 30 2018
8042ac440504		rempt	Reorganize the setup code for the General page	May 30 2018
e664fe62ac79		rempt	Fix typo	May 30 2018
f00c74d528b3		rempt	Simplify the 3rdparty page a bit	May 30 2018
e2a5181d08e6		rempt	Comment out ffmpeg for now	May 30 2018
4dc29a83f121		rempt	Comment out ffmpeg for now	May 30 2018
cfca5a3fb016		rempt	Add a tab with links to 3rd party libraries	May 30 2018
ca6ffaf655c9		rempt	Use our own copy of exiv2, since the site is unstable	May 30 2018
7030f6a906da		emmetoneill	Animation Timeline Refactor + Bugfix	May 29 2018
96bf129c5f7b		rempt	Fix formulation for 8 bit channel depth again	May 29 2018
97c1c1bf9fa4		rempt	Improve the text describing 8 bits/integer channel depth	May 29 2018
53c866da80f2		rempt	Revert "Remove two find cmake modules that are in the cmake distribution"	May 29 2018
bf792fab6973	D13142	rempt	Update appdata.xml	May 29 2018
1553c12637e1	D13144	pino	Fix loading of the Python library	May 29 2018
8d4fafe65aec		rempt	Merge branch 'rempt/heif-impex'	May 29 2018
af85f009d6fa		rempt	We need libheif 1.2.0 minimum	May 28 2018
006d9da940f4		alvinhochun	Windows deps: Add prebuilt ffmpeg by Zeranoe	May 27 2018
b33f82e15626		alvinhochun	NSIS: Make FFmpeg unable to be deselected	May 27 2018
88e9c00788e1		Dirk Farin/rempt	read Exif and XMP data	May 26 2018
8b77837b4976		Dirk Farin/rempt	changed include name	May 26 2018
c5df730fbde7		Dirk Farin/rempt	adapted to changed C++ API	May 26 2018
9197be901e4d		vanyossi	Merge branch 'ivany/T8580-Brush-AVX-Optim'	May 25 2018
b9a538805637		vanyossi	NEW: KisMaskGeneratorBenchmark	May 25 2018
fe8e8b25c895		rempt	Add skeleton xmp and exiv handling to heif	May 25 2018
5fccf986fa95		rempt	Refactor the exif info visitor	May 25 2018
9d5e2370f862		rempt	Refactor handling of metadata a bit	May 25 2018
d692a1cf3698		rempt	Add apidox	May 25 2018
5f5b64b15a23		rempt	Fix memory leak	May 25 2018
59df4427d6c1		rempt	Check whether there's alpha and if there is, write it	May 25 2018
f303adcdff91		rempt	Disable/enable the quality slider depending on the lossless check	May 25 2018
058da93fa000		rempt	Remove unused files	May 25 2018
bf21ee1e4d83		rempt	Add a FindHEIF cmake module	May 25 2018
132f4fcb8d99		rempt	Remove two find cmake modules that are in the cmake distribution	May 25 2018
dabc4b159cb8		rempt	Remove unused FindLibW* cmake modules	May 25 2018
c83359fc37eb		Dirk Farin/rempt	remove old error checking code	May 25 2018
b97f5154bc92		Dirk Farin/rempt	move heif error -> krita error code into separate file	May 25 2018
e858e5485799		Dirk Farin/rempt	first working Heif export plugin	May 25 2018
1921f95c19c0		vanyossi	Merge branch 'ivany/T8580-Brush-AVX-Optim'	May 25 2018
008501d5d413		vanyossi	Merge branch 'ivany/T8580-Brush-AVX-Optim'	May 25 2018
d70780c2c5a0		dkazakov	Fix painting of Pass-through group layers in Isolated Mode	May 24 2018
5255a2f3c959		dkazakov	Fix extent calculation of KisMask	May 24 2018
809cf725d879		Dirk Farin/rempt	use new C++ API of libheif and clean up	May 24 2018

Changes (444)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		3rdparty/CMakeLists.txt
M		3rdparty/ext_exiv2/CMakeLists.txt
A	(dir)	3rdparty/ext_ffmpeg/
A		3rdparty/ext_ffmpeg/CMakeLists.txt
M		3rdparty/ext_frameworks/CMakeLists.txt
M		3rdparty/ext_frameworks/kconfig.diff
D		3rdparty/ext_frameworks/kcoreaddons-compile-fix.diff
M		3rdparty/ext_frameworks/ki18n-appdatalocation.diff
M		3rdparty/ext_frameworks/kwidgetsaddons.diff
M		3rdparty/ext_gmic/CMakeLists.txt
M		CMakeLists.txt
M		build-tools/docker/default-home/.bash_aliases
M		build-tools/docker/default-home/devenv.inc
M		build-tools/windows/build.cmd
M		cmake/modules/FindFFTW3.cmake
A		cmake/modules/FindHEIF.cmake
D		cmake/modules/FindLibWpd.cmake
D		cmake/modules/FindLibWpg.cmake
D		cmake/modules/FindLibWps.cmake
M		cmake/modules/FindPythonLibrary.cmake
M		krita/data/aboutdata/aboutdata.qrc
A		krita/data/aboutdata/libraries.txt
M		krita/data/splash/splash_holidays.xpm
A		krita/data/splash/splash_holidays_x2.xpm
M		krita/data/splash/splash_screen.xpm
A		krita/data/splash/splash_screen_x2.xpm
M		krita/data/templates/animation/Anim-Jp-EN.desktop
M		krita/data/templates/comics/.directory
M		krita/data/templates/comics/BD-EuroTemplate.desktop
M		krita/data/templates/comics/Manga-JpTemplate.desktop
M		krita/data/templates/comics/a4_waffle_grid.desktop
M		krita/data/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
M		krita/data/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
M		krita/data/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
M		krita/data/templates/design/DesignpresentationA4portrait_2480x3508,300dpiRGB_8bit_.desktop
M		krita/data/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
M		krita/data/templates/design/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
M		krita/data/templates/design/web_design.desktop
M		krita/data/templates/dslr/.directory
M		krita/data/templates/dslr/Canon_550D_5184x3456.desktop
M		krita/data/templates/dslr/Canon_5Dmk3_5760x3840.desktop
M		krita/data/templates/dslr/Nikon_D3000_3872x2592.desktop
M		krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop
M		krita/data/templates/dslr/Nikon_D7000_4928x3264.desktop
M		krita/data/templates/texture/Texture1024x10248bitsrgb.desktop
M		krita/data/templates/texture/Texture1k32bitscalar.desktop
M		krita/data/templates/texture/Texture1k8bitsrgb.desktop
M		krita/data/templates/texture/Texture2048x20488bitsrgb.desktop
M		krita/data/templates/texture/Texture256x2568bitsrgb.desktop
M		krita/data/templates/texture/Texture2k32bitscalar.desktop
M		krita/data/templates/texture/Texture2k8bitsrgb.desktop
M		krita/data/templates/texture/Texture4096x40968bitsrgb.desktop
M		krita/data/templates/texture/Texture4k32bitscalar.desktop
M		krita/data/templates/texture/Texture4k8bitsrgb.desktop
M		krita/data/templates/texture/Texture512x5128bitsrgb.desktop
M		krita/data/templates/texture/Texture8k32bitscalar.desktop
M		krita/data/templates/texture/Texture8k8bitsrgb.desktop
M		krita/krita.action
M		krita/krita4.xmlgui
M		krita/kritamenu.action
M		krita/main.cc
M		krita/org.kde.krita.appdata.xml
M		libs/CMakeLists.txt
M		libs/brush/kis_pipebrush_parasite.cpp
M		libs/brush/tests/CMakeLists.txt
M		libs/flake/KoShape.cpp
M		libs/flake/resources/KoSvgSymbolCollectionResource.cpp
M		libs/flake/tools/PathToolOptionWidgetBase.ui
M		libs/image/commands/kis_image_lock_command.cpp
M		libs/image/commands/kis_image_lock_command.h
M		libs/image/kis_antialiasing_fade_maker.h
M		libs/image/kis_brush_mask_applicator_factories.cpp
M		libs/image/kis_circle_mask_generator.cpp
M		libs/image/kis_circle_mask_generator.h
M		libs/image/kis_edge_detection_kernel.h
M		libs/image/kis_gauss_circle_mask_generator.cpp
M		libs/image/kis_gauss_circle_mask_generator.h
A		libs/image/kis_gauss_circle_mask_generator_p.h
M		libs/image/kis_image_animation_interface.cpp
M		libs/image/kis_image_animation_interface.h
M		libs/image/kis_keyframe.cpp
M		libs/image/kis_keyframe.h
M		libs/image/kis_layer.cc
M		libs/image/kis_paint_device.cc
M		libs/image/kis_raster_keyframe_channel.cpp
M		libs/image/kis_raster_keyframe_channel.h
M		libs/image/lazybrush/kis_colorize_mask.cpp
M		libs/image/metadata/kis_exif_info_visitor.h
M		libs/image/tests/CMakeLists.txt
A		libs/image/tests/KisMaskGeneratorBenchmark.cpp
P		libs/image/tests/KisMaskGeneratorBenchmark.h Copied from libs/ui/widgets/KisLayoutSelector.h
M		libs/image/tests/kis_lazy_brush_test.cpp
A		libs/image/tests/kis_mask_similarity_test.cpp
P		libs/image/tests/kis_mask_similarity_test.h Copied from plugins/dockers/pager/PagerDockerPlugin.h
M		libs/koplugin/KisMimeDatabase.cpp
M		libs/libkis/Document.cpp
M		libs/libkis/Document.h
M		libs/libkis/Krita.cpp
M		libs/libkis/Node.cpp
M		libs/libkis/Node.h
M		libs/libkis/Palette.cpp
M		libs/libkis/Palette.h
M		libs/libqml/plugins/kritasketchplugin/models/PaletteColorsModel.cpp
M		libs/pigment/CMakeLists.txt
M		libs/pigment/KoCompositeOpRegistry.cpp
M		libs/pigment/compositeops/KoCompositeOps.h
M		libs/pigment/compositeops/KoVcMultiArchBuildSupport.h
M		libs/pigment/resources/KoColorSet.cpp
M		libs/pigment/resources/KoColorSet.h
A		libs/pigment/resources/KoColorSetEntry.cpp
A		libs/pigment/resources/KoColorSetEntry.h
M		libs/ui/CMakeLists.txt
M		libs/ui/KisApplication.cpp
M		libs/ui/KisApplication.h
M		libs/ui/KisAsyncAnimationFramesSavingRenderer.cpp
M		libs/ui/KisColorsetChooser.cpp
M		libs/ui/KisDocument.cpp
M		libs/ui/KisImportExportManager.cpp
V		libs/ui/{KisPaintopPropertiesBase.cpp ← kis_base_option.cpp}
V		libs/ui/{KisPaintopPropertiesBase.h ← kis_base_option.h}
M		libs/ui/KisPaletteModel.cpp
M		libs/ui/KisWindowLayoutManager.cpp
M		libs/ui/KisWindowLayoutManager.h
M		libs/ui/actions/KisPasteActionFactory.cpp
M		libs/ui/canvas/kis_animation_player.cpp
M		libs/ui/canvas/kis_animation_player.h
M		libs/ui/dialogs/KisAsyncAnimationRenderDialogBase.cpp
M		libs/ui/dialogs/KisSessionManagerDialog.cpp
M		libs/ui/dialogs/kis_about_application.cpp
P		libs/ui/dialogs/kis_about_application.h Copied to plugins/dockers/animation/timeline_insert_keyframe_dialog.h
M		libs/ui/dialogs/kis_dlg_internal_color_selector.cpp
M		libs/ui/dialogs/kis_dlg_layer_style.cpp
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/dialogs/kis_dlg_preferences.h
M		libs/ui/flake/KisReferenceImagesLayer.cpp
M		libs/ui/flake/KisReferenceImagesLayer.h
M		libs/ui/forms/wdgcolorsettings.ui
M		libs/ui/forms/wdglayerproperties.ui
M		libs/ui/forms/wdgpaintopsettings.ui
M		libs/ui/forms/wdgtabletsettings.ui
M		libs/ui/input/KisInputActionGroup.h
M		libs/ui/input/config/kis_input_configuration_page.ui
M		libs/ui/input/kis_abstract_input_action.cpp
M		libs/ui/input/kis_alternate_invocation_action.cpp
M		libs/ui/input/kis_change_frame_action.cpp
A	(dir)	libs/ui/input/wintab/drawpile_tablettester/
A		libs/ui/input/wintab/drawpile_tablettester/README.md
A		libs/ui/input/wintab/drawpile_tablettester/tablettest.cpp
A		libs/ui/input/wintab/drawpile_tablettester/tablettest.h
A		libs/ui/input/wintab/drawpile_tablettester/tablettest.ui
A		libs/ui/input/wintab/drawpile_tablettester/tablettester.cpp
A		libs/ui/input/wintab/drawpile_tablettester/tablettester.h
M		libs/ui/input/wintab/qxcbconnection_xi2.cpp
M		libs/ui/kis_action_manager.cpp
V		libs/ui/{kis_base_option.cpp → KisPaintopPropertiesBase.cpp}
V		libs/ui/{kis_base_option.h → KisPaintopPropertiesBase.h}
M		libs/ui/kis_file_layer.cpp
M		libs/ui/kis_multinode_property.h
M		libs/ui/kis_paintop_box.cc
M		libs/ui/kis_paintop_option.h
M		libs/ui/kis_palette_view.cpp
M		libs/ui/kis_selection_manager.cc
M		libs/ui/kis_splash_screen.cpp
M		libs/ui/kis_splash_screen.h
M		libs/ui/opengl/kis_opengl_image_textures.cpp
M		libs/ui/tool/kis_tool_paint.cc
M		libs/ui/tool/kis_tool_paint.h
M		libs/ui/tool/kis_tool_utils.cpp
M		libs/ui/tool/kis_tool_utils.h
M		libs/ui/tool/strokes/kis_color_picker_stroke_strategy.cpp
D		libs/ui/widgets/KisLayoutSelector.cpp
P		libs/ui/widgets/KisLayoutSelector.h Deleted after being copied to multiple locations: libs/image/tests/KisMaskGeneratorBenchmark.h plugins/impex/heif/HeifImport.h plugins/tools/defaulttool/referenceimagestool/KisReferenceImageCollection.h
M		libs/ui/widgets/KisVisualRectangleSelectorShape.cpp
M		libs/ui/widgets/kis_advanced_color_space_selector.cc
M		libs/ui/widgets/kis_custom_image_widget.cc
M		libs/ui/widgets/kis_lod_availability_widget.cpp
M		libs/ui/widgets/kis_scratch_pad.cpp
M		libs/widgets/KoColorSetWidget.cpp
M		libs/widgets/KoEditColorSetDialog.cpp
M		libs/widgets/KoGlobal.cpp
M		libs/widgets/kis_file_name_requester.cpp
M		libs/widgets/kis_file_name_requester.h
M		packaging/linux/snap/setup/gui/krita.desktop
V		packaging/windows/{ → installer}/ConfigureInstallerNsis.cmake
V		packaging/windows/{ → installer}/MakeInstallerNsis.cmake.in
A	(dir)	packaging/windows/installer/
V		packaging/windows/{installer ← }/ConfigureInstallerNsis.cmake
V		packaging/windows/{installer ← }/MakeInstallerNsis.cmake.in
A	(dir)	packaging/windows/installer/include/
A		packaging/windows/installer/include/FileExists2.nsh
A		packaging/windows/installer/include/IsFileInUse.nsh
A		packaging/windows/installer/installer_krita.nsi
V		packaging/windows/{installer ← }/license_gpl-3.0.rtf
D		packaging/windows/krita_installer
D		packaging/windows/krita_installer/CPL.TXT
D		packaging/windows/krita_installer/PreserveGUIDs.xslt
D		packaging/windows/krita_installer/README.txt
D		packaging/windows/krita_installer/build_msi.bat
D		packaging/windows/krita_installer/build_msi.ps1
D		packaging/windows/krita_installer/env.bat
D		packaging/windows/krita_installer/env.ps1
D		packaging/windows/krita_installer/krita-files.json
D		packaging/windows/krita_installer/krita.wxi
D		packaging/windows/krita_installer/krita.wxs
D		packaging/windows/krita_installer/package.bat
D		packaging/windows/krita_installer/package.ps1
D		packaging/windows/krita_installer/res
D		packaging/windows/krita_installer/res/UIExtension
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/Billboards
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/Billboards/billboard.bmp
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/Billboards/template.bmp
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/New.ico
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/Up.ico
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/bannrbmp.bmp
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/billboard03.bmp
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/dlgbmp.bmp
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/dlgbmp.bmp.bmp
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/exclamic.ico
D		packaging/windows/krita_installer/res/UIExtension/Bitmaps/info.ico
D		packaging/windows/krita_installer/res/UIExtension/CustomExitDialog.wxs
D		packaging/windows/krita_installer/res/UIExtension/CustomMaintenanceWelcomeDlg.wxs
D		packaging/windows/krita_installer/res/UIExtension/CustomProgressDlg.wxs
D		packaging/windows/krita_installer/res/UIExtension/CustomResumeDlg.wxs
D		packaging/windows/krita_installer/res/UIExtension/CustomUI_Mondo.wxs
D		packaging/windows/krita_installer/res/UIExtension/CustomWelcomeDlg.wxs
D		packaging/windows/krita_installer/res/UIExtension/VSError.wxs
D		packaging/windows/krita_installer/res/UIExtension/gpl-2.0.rtf
D		packaging/windows/krita_installer/res/package
D		packaging/windows/krita_installer/res/package/env.bat
D		packaging/windows/krita_installer/res/wix_snippets
D		packaging/windows/krita_installer/res/wix_snippets/BundleVC2015x64.wxs
D		packaging/windows/krita_installer/res/wix_snippets/FindVC2015ia64.wxi
D		packaging/windows/krita_installer/res/wix_snippets/FindVC2015x64.wxi
D		packaging/windows/krita_installer/res/wix_snippets/FindVC2015x86.wxi
D		packaging/windows/krita_installer/res/wix_snippets/MergeModules_x64.wxi
D		packaging/windows/krita_installer/res/wix_snippets/MergeModules_x86.wxi
D		packaging/windows/krita_installer/res/wix_snippets/VC2015DLLs.wxi
D		packaging/windows/krita_installer/run_heat.bat
V		packaging/windows/{ → installer}/license_gpl-3.0.rtf
D		packaging/windows/makepkg.bat
M		packaging/windows/package-complete.cmd
M		plugins/assistants/Assistants/kis_assistant_tool.cc
M		plugins/color/lcms2engine/LcmsEnginePlugin.cpp
M		plugins/color/lcms2engine/compositeops/RgbCompositeOpValue.h
M		plugins/dockers/CMakeLists.txt
M		plugins/dockers/animation/CMakeLists.txt
M		plugins/dockers/animation/animation_docker.cpp
M		plugins/dockers/animation/animation_docker.h
M		plugins/dockers/animation/kis_time_based_item_model.cpp
M		plugins/dockers/animation/kis_time_based_item_model.h
M		plugins/dockers/animation/timeline_color_scheme.cpp
M		plugins/dockers/animation/timeline_color_scheme.h
M		plugins/dockers/animation/timeline_docker.cpp
M		plugins/dockers/animation/timeline_frames_item_delegate.cpp
M		plugins/dockers/animation/timeline_frames_item_delegate.h
M		plugins/dockers/animation/timeline_frames_model.cpp
M		plugins/dockers/animation/timeline_frames_model.h
M		plugins/dockers/animation/timeline_frames_view.cpp
M		plugins/dockers/animation/timeline_frames_view.h
A		plugins/dockers/animation/timeline_insert_keyframe_dialog.cpp
P		plugins/dockers/animation/timeline_insert_keyframe_dialog.h Copied from libs/ui/dialogs/kis_about_application.h
M		plugins/dockers/animation/timeline_ruler_header.cpp
M		plugins/dockers/animation/timeline_ruler_header.h
M		plugins/dockers/colorslider/kis_color_slider_input.cpp
D		plugins/dockers/pager
D		plugins/dockers/pager/CMakeLists.txt
D		plugins/dockers/pager/PagerDockerDock.cpp
D		plugins/dockers/pager/PagerDockerDock.h
D		plugins/dockers/pager/PagerDockerPlugin.cpp
P		plugins/dockers/pager/PagerDockerPlugin.h Deleted after being copied to multiple locations: libs/image/tests/kis_mask_similarity_test.h plugins/impex/heif/HeifError.h
D		plugins/dockers/pager/krita_pagerdocker.json
M		plugins/dockers/palettedocker/palettedocker_dock.cpp
M		plugins/dockers/throttle/Throttle.cpp
M		plugins/dockers/touchdocker/TouchDockerDock.cpp
M		plugins/extensions/animationrenderer/DlgAnimationRenderer.cpp
M		plugins/extensions/animationrenderer/DlgAnimationRenderer.h
M		plugins/extensions/metadataeditor/editors/exif.ui
M		plugins/extensions/metadataeditor/kis_meta_data_model.cpp
M		plugins/extensions/pykrita/plugin/CMakeLists.txt
M		plugins/extensions/pykrita/plugin/PykritaModule.cpp
M		plugins/extensions/pykrita/plugin/PykritaModule.h
M		plugins/extensions/pykrita/plugin/PythonPluginManager.cpp
M		plugins/extensions/pykrita/plugin/krita/__init__.py
M		plugins/extensions/pykrita/plugin/krita/dockwidgetfactory.py
M		plugins/extensions/pykrita/plugin/utilities.cpp
M		plugins/extensions/pykrita/sip/CMakeLists.txt
A		plugins/extensions/pykrita/sip/__init__.py
M		plugins/extensions/pykrita/sip/krita/Document.sip
M		plugins/extensions/pykrita/sip/krita/Palette.sip
M		plugins/extensions/qmic/PluginSettings.cpp
M		plugins/filters/asccdl/kis_asccdl_filter.cpp
M		plugins/filters/colorsfilters/wdg_desaturate.ui
M		plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp
M		plugins/filters/convertheightnormalmap/kis_wdg_convert_height_to_normal_map.cpp
M		plugins/filters/edgedetection/kis_edge_detection_filter.cpp
M		plugins/filters/edgedetection/kis_wdg_edge_detection.cpp
M		plugins/filters/embossfilter/kis_emboss_filter.cpp
M		plugins/flake/textshape/textlayout/KoTextLayoutNoteArea.cpp
M		plugins/impex/CMakeLists.txt
M		plugins/impex/exr/exr_converter.cc
M		plugins/impex/exr/exr_converter.h
M		plugins/impex/exr/exr_export.cc
A	(dir)	plugins/impex/heif/
A		plugins/impex/heif/CMakeLists.txt
A		plugins/impex/heif/HeifError.cpp
V		plugins/{impex/heif/HeifError.h ← dockers/pager/PagerDockerPlugin.h}
A		plugins/impex/heif/HeifExport.cpp
A		plugins/impex/heif/HeifExport.h
A		plugins/impex/heif/HeifImport.cpp
P		plugins/impex/heif/HeifImport.h Copied from libs/ui/widgets/KisLayoutSelector.h
A		plugins/impex/heif/WdgHeifExport.ui
A		plugins/impex/heif/krita_heif.desktop
A		plugins/impex/heif/krita_heif_export.json
A		plugins/impex/heif/krita_heif_import.json
M		plugins/impex/jpeg/kis_jpeg_converter.cc
M		plugins/impex/jpeg/kis_jpeg_export.cc
M		plugins/impex/png/kis_png_export.cc
M		plugins/impex/psd/krita_psd.desktop
M		plugins/impex/psd/krita_psd_export.json
M		plugins/impex/psd/krita_psd_import.json
M		plugins/impex/psd/psd_pixel_utils.cpp
M		plugins/impex/raw/3rdparty/libkdcraw/src/dcrawsettingswidget.cpp
M		plugins/impex/raw/krita_raw_import.json
M		plugins/impex/spriter/kis_spriter_export.h
M		plugins/impex/video/video_saver.cpp
M		plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
M		plugins/paintops/curvebrush/kis_curve_line_option.cpp
M		plugins/paintops/curvebrush/kis_curve_line_option.h
M		plugins/paintops/curvebrush/kis_curve_paintop.h
M		plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
M		plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp
M		plugins/paintops/defaultpaintops/brush/kis_brushop.h
M		plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
M		plugins/paintops/deform/deform_brush.h
M		plugins/paintops/deform/kis_brush_size_option.cpp
M		plugins/paintops/deform/kis_brush_size_option.h
M		plugins/paintops/deform/kis_deform_paintop.h
M		plugins/paintops/deform/kis_deform_paintop_settings.cpp
M		plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp
M		plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
M		plugins/paintops/gridbrush/kis_gridop_option.cpp
M		plugins/paintops/gridbrush/kis_gridop_option.h
M		plugins/paintops/hairy/kis_hairy_paintop.cpp
M		plugins/paintops/libpaintop/CMakeLists.txt
M		plugins/paintops/libpaintop/KisMaskingBrushOptionProperties.cpp
M		plugins/paintops/libpaintop/Mainpage.dox
V		plugins/paintops/libpaintop/{kis_airbrush_option.cpp → kis_airbrush_option_widget.cpp}
V		plugins/paintops/libpaintop/{kis_airbrush_option.h → kis_airbrush_option_widget.h}
V		plugins/paintops/libpaintop/{kis_airbrush_option_widget.cpp ← kis_airbrush_option.cpp}
V		plugins/paintops/libpaintop/{kis_airbrush_option_widget.h ← kis_airbrush_option.h}
M		plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
M		plugins/paintops/libpaintop/kis_brush_based_paintop.h
M		plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
M		plugins/paintops/libpaintop/kis_brush_option.cpp
M		plugins/paintops/libpaintop/kis_brush_option.h
M		plugins/paintops/libpaintop/kis_brush_option_widget.h
M		plugins/paintops/libpaintop/kis_compositeop_option.cpp
M		plugins/paintops/libpaintop/kis_curve_option.h
M		plugins/paintops/libpaintop/kis_paintop_plugin_utils.h
M		plugins/paintops/libpaintop/kis_spacing_selection_widget.cpp
M		plugins/paintops/particle/kis_particle_paintop.h
M		plugins/paintops/particle/kis_particle_paintop_settings.cpp
M		plugins/paintops/particle/kis_particle_paintop_settings_widget.cpp
M		plugins/paintops/sketch/kis_sketch_paintop.cpp
M		plugins/paintops/sketch/kis_sketch_paintop.h
M		plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
M		plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp
M		plugins/paintops/spray/kis_spray_paintop.h
M		plugins/paintops/spray/kis_spray_paintop_settings.cpp
M		plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
M		plugins/paintops/spray/kis_sprayop_option.cpp
M		plugins/paintops/spray/kis_sprayop_option.h
M		plugins/paintops/spray/spray_brush.cpp
M		plugins/paintops/spray/spray_brush.h
M		plugins/paintops/tangentnormal/kis_tangent_normal_paintop.h
M		plugins/paintops/tangentnormal/kis_tangent_normal_paintop_settings_widget.cpp
M		plugins/paintops/tangentnormal/kis_tangent_tilt_option.h
M		plugins/python/assignprofiledialog/assignprofiledialog.py
M		plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
M		plugins/python/colorspace/colorspace.py
M		plugins/python/colorspace/kritapykrita_colorspace.desktop
M		plugins/python/colorspace/uicolorspace.py
M		plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
M		plugins/python/documenttools/documenttools.py
M		plugins/python/documenttools/kritapykrita_documenttools.desktop
M		plugins/python/documenttools/uidocumenttools.py
M		plugins/python/exportlayers/exportlayers.py
M		plugins/python/exportlayers/kritapykrita_exportlayers.desktop
M		plugins/python/exportlayers/uiexportlayers.py
M		plugins/python/filtermanager/components/filtermanagertreemodel.py
M		plugins/python/filtermanager/filtermanager.py
M		plugins/python/filtermanager/kritapykrita_filtermanager.desktop
M		plugins/python/filtermanager/uifiltermanager.py
M		plugins/python/hello/hello.py
M		plugins/python/hello/kritapykrita_hello.desktop
M		plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
M		plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
M		plugins/python/lastdocumentsdocker/lastdocumentsdocker.py
M		plugins/python/palette_docker/kritapykrita_palette_docker.desktop
M		plugins/python/palette_docker/palette_docker.py
M		plugins/python/palette_docker/palette_exporter_gimppalette.py
M		plugins/python/palette_docker/palette_exporter_inkscapeSVG.py
M		plugins/python/palette_docker/palette_sortColors.py
M		plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
M		plugins/python/quick_settings_docker/quick_settings_docker.py
M		plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
M		plugins/python/scripter/debugcontroller.py
M		plugins/python/scripter/debugger_scripter/debugger.py
M		plugins/python/scripter/documentcontroller.py
M		plugins/python/scripter/kritapykrita_scripter.desktop
M		plugins/python/scripter/scripter.py
M		plugins/python/scripter/ui_scripter/actions/closeaction/closeaction.py
M		plugins/python/scripter/ui_scripter/actions/newaction/newaction.py
M		plugins/python/scripter/ui_scripter/actions/openaction/openaction.py
M		plugins/python/scripter/ui_scripter/actions/reloadaction/reloadaction.py
M		plugins/python/scripter/ui_scripter/actions/runaction/docwrapper.py
M		plugins/python/scripter/ui_scripter/actions/runaction/runaction.py
M		plugins/python/scripter/ui_scripter/actions/settingsaction/settingsaction.py
M		plugins/python/scripter/uicontroller.py
M		plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
M		plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
M		plugins/python/tenbrushes/tenbrushes.py
M		plugins/python/tenbrushes/uitenbrushes.py
M		plugins/python/tenscripts/kritapykrita_tenscripts.desktop
M		plugins/python/tenscripts/tenscripts.py
M		plugins/python/tenscripts/uitenscripts.py
M		plugins/tools/basictools/kis_tool_brush.cc
M		plugins/tools/basictools/kis_tool_colorpicker.cc
M		plugins/tools/basictools/kis_tool_fill.cc
M		plugins/tools/basictools/kis_tool_measure.cc
M		plugins/tools/defaulttool/CMakeLists.txt
M		plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
A		plugins/tools/defaulttool/referenceimagestool/KisReferenceImageCollection.cpp
V		{plugins/tools/defaulttool/referenceimagestool/KisReferenceImageCollection.h ← libs/ui/widgets/KisLayoutSelector.h}
M		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
M		plugins/tools/tool_crop/kis_tool_crop.cc
M		plugins/tools/tool_crop/kis_tool_crop.h
M		plugins/tools/tool_lazybrush/kis_tool_lazy_brush_options_widget.cpp
M		plugins/tools/tool_transform2/kis_tool_transform.cc
M		plugins/tools/tool_transform2/kis_tool_transform.h