Diffusion Krita 0f4126e82672

Merge branch 'master' into petrovic/scratchpad-api-fix
0f4126e82672
Actions

Authored by scottpetrovic on Jun 11 2020, 10:47 AM.

Description

Merge branch 'master' into petrovic/scratchpad-api-fix

Details

Committed

scottpetrovic

Jun 11 2020, 10:47 AM

Parents

R37:1454274f20d5: make create scratchpad more explicit and fix casting
R37:5c23c1053487: Make kimageformats depend on karchive so it gets built

Branches

Unknown

Tags

Unknown

scottpetrovic committed R37:0f4126e82672: Merge branch 'master' into petrovic/scratchpad-api-fix (authored by scottpetrovic).Jun 11 2020, 10:47 AM

Merged Changes

Commit	Author	Details	Committed
5c23c1053487	rempt	Make kimageformats depend on karchive so it gets built	Jun 11 2020
6b5eb6040ab9	rempt	Fix some more action files	Jun 11 2020
d7661b0dd648	rempt	Fix debug lines	Jun 11 2020
71b568334e91	rempt	Revert "debug--"	Jun 11 2020
9bf699b6a931	rempt	debug--	Jun 11 2020
29b204ba0321	rempt	debug--	Jun 11 2020
08bdfe561e80	alvinhochun	Win installer: Update hash for patched NSIS package	Jun 11 2020
2cfa87779439	rempt	Restore the karchive patch that disables bzip2	Jun 11 2020
86ac5276f03b	Maximilian Schier	Fixup: Defer UI updates to avoid locking against held non-reentrant lock	Jun 11 2020
3f3d802f6324	Maximilian Schier	Toggle session manager button availability depending on session selection	Jun 11 2020
1dadaface264	emmetoneill	Removed a leftover debug output call.	Jun 10 2020
2fe1d06c61dc	emmetoneill	Krita 5: New Animation Workspace.	Jun 10 2020
3336084fc937	emmetoneill	Animation Timeline Docker: Cleanup & AutoKey	Jun 10 2020
d3c6a832ac6f	emmetoneill	Removed classic Animation Docker!	Jun 10 2020
e7bcb7e4d4d6	emmetoneill	Animation Timeline Docker: Settings Menu Widget.	Jun 10 2020
dba979d5805d	emmetoneill	Krita 5: New Animation Timeline Docker.	Jun 10 2020
20524f2ae3de	workingdodo/dkazakov	Color Selector Uses Theme Color for Background	Jun 10 2020
ce3a1a3194dc	rempt	Add a warning if an action file is empty	Jun 10 2020
5b41b826fb1d	rempt	Fix the plugins/tool action files	Jun 10 2020
89fddda06ef9	rempt	Add context to the "Original" label	Jun 10 2020
17e6e2841c24	mwein	Remove old workaround for popup palette hiding	Jun 9 2020
11e140ffc3c4	gdquest/dkazakov	Batch exporter add-on: update export code for Krita 4.3	Jun 9 2020
06450d5646d2	dkazakov	Proper fix for https://bugs.kde.org/show_bug.cgi?id=385521 which I came across…	Jun 9 2020
92678b937238	hellozee	Fix crash on moving a single lonely anchor	Jun 9 2020
00fb1483ef42	dkazakov	Make Angle preferred renderer on Windows	Jun 9 2020
9f98ec4ab2ea	rempt	Disable the fast float plugin for now.	Jun 9 2020
b5e18c501723	rempt	Re-add karchive so kimageformats can open kra files	Jun 9 2020
e3c0816bc11f	dkazakov	Fix border artifacts in edge-detection filters	Jun 8 2020
9e9bfce29b68	emmetoneill	Fixed OpenGL canvas rendering for High-DPI displays.	Jun 8 2020
9dbe11bbdb4c	rempt	Fix error in 3rdparty instructions	Jun 8 2020
6b83942ff92e	woltherav	Change shear to be in percentages as it is a ratio, not pixels.	Jun 7 2020
1eecb736ee8d	woltherav	Hide 3d transformation box, remove unused color box.	Jun 7 2020
2d505b0c2380	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 7 2020

Changes (90)

				Path	Packages
	M			3rdparty/README.md
	M			3rdparty/ext_frameworks/CMakeLists.txt
	A			3rdparty/ext_frameworks/karchive.diff
	M			3rdparty/ext_lcms2/CMakeLists.txt
	M			krita/data/workspaces/Animation.kws
	M			krita/krita.action
	P			krita/pics/svg/dark_animation_pause.svg Copied from krita/pics/svg/light_lazyframeOn.svg
	V			krita/pics/svg/{dark_auto-key-off.svg ← dark_lazyframeOff.svg}
	V			krita/pics/svg/{dark_auto-key-on.svg ← dark_lazyframeOn.svg}
	V			krita/pics/svg/{dark_lazyframeOff.svg → dark_auto-key-off.svg}
	V			krita/pics/svg/{dark_lazyframeOn.svg → dark_auto-key-on.svg}
	P			krita/pics/svg/light_animation_pause.svg Copied from krita/pics/svg/light_lazyframeOn.svg
	V			krita/pics/svg/{light_auto-key-off.svg ← light_lazyframeOff.svg}
	V			krita/pics/svg/{light_auto-key-on.svg ← light_lazyframeOn.svg}
	V			krita/pics/svg/{light_lazyframeOff.svg → light_auto-key-off.svg}
	P			krita/pics/svg/light_lazyframeOn.svg Deleted after being copied to multiple locations: krita/pics/svg/dark_animation_pause.svg krita/pics/svg/light_animation_pause.svg krita/pics/svg/light_auto-key-on.svg
	M			krita/pics/svg/svg-icons.qrc
	M			libs/image/kis_convolution_painter.h
	M			libs/image/kis_edge_detection_kernel.cpp
	M			libs/image/kis_image_animation_interface.cpp
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_image_config.h
	M			libs/image/kis_transaction_data.cpp
	M			libs/ui/CMakeLists.txt
	M			libs/ui/canvas/kis_animation_player.cpp
	M			libs/ui/canvas/kis_animation_player.h
	M			libs/ui/dialogs/KisSessionManagerDialog.cpp
	M			libs/ui/dialogs/KisSessionManagerDialog.h
	M			libs/ui/kis_canvas_resource_provider.cpp
	M			libs/ui/kis_canvas_resource_provider.h
	M			libs/ui/kis_favorite_resource_manager.h
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_popup_palette.cpp
	M			libs/ui/kis_popup_palette.h
	M			libs/ui/opengl/kis_opengl.cpp
	M			libs/ui/opengl/kis_opengl_canvas2.cpp
	M			libs/ui/tool/kis_resources_snapshot.cpp
	M			libs/ui/tool/kis_resources_snapshot.h
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_preset_live_preview_view.cpp
	M			libs/ui/widgets/kis_preset_live_preview_view.h
	A			libs/ui/widgets/kis_transport_controls.cpp
	P			libs/ui/widgets/kis_transport_controls.h Copied from plugins/dockers/animation/timeline_docker.h
	A			libs/ui/widgets/kis_utility_title_bar.cpp
	P			libs/ui/widgets/kis_utility_title_bar.h Copied from plugins/dockers/animation/timeline_docker.h
	M			libs/widgetutils/kis_action_registry.cpp
	M			packaging/windows/installer/MakeInstallerNsis.cmake.in
	M			plugins/assistants/Assistants/KisAssistantTool.action
	M			plugins/dockers/advancedcolorselector/kis_color_selector.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_settings.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_settings.h
	M			plugins/dockers/advancedcolorselector/kis_minimal_shade_selector.cpp
	M			plugins/dockers/advancedcolorselector/kis_shade_selector_line_combo_box_popup.cpp
	M			plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
	M			plugins/dockers/animation/CMakeLists.txt
	D			plugins/dockers/animation/animation_docker.cpp
	D			plugins/dockers/animation/animation_docker.h
	M			plugins/dockers/animation/animation_dockers.cpp
	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_docker.cpp
	P			plugins/dockers/animation/timeline_docker.h Copied to multiple locations: libs/ui/widgets/kis_transport_controls.h libs/ui/widgets/kis_utility_title_bar.h
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/generators/pattern/kis_wdg_pattern.cpp
	M			plugins/generators/pattern/wdgpatternoptions.ui
	M			plugins/python/batch_exporter/COATools.py
	M			plugins/python/batch_exporter/Config.py
	M			plugins/python/batch_exporter/Utils/Export.py
	M			plugins/python/batch_exporter/kritapykrita_batch_exporter.desktop
	M			plugins/python/batch_exporter/pyproject.toml
	M			plugins/python/channels2layers/channels2layers.py
	M			plugins/python/channels2layers/kritapykrita_channels2layers.desktop
	M			plugins/tools/basictools/KisToolPath.action
	M			plugins/tools/basictools/KisToolPencil.action
	M			plugins/tools/selectiontools/KisToolSelectContiguous.action
	M			plugins/tools/selectiontools/KisToolSelectElliptical.action
	M			plugins/tools/selectiontools/KisToolSelectMagnetic.action
	M			plugins/tools/selectiontools/KisToolSelectMagnetic.cc
	M			plugins/tools/selectiontools/KisToolSelectOutline.action
	M			plugins/tools/selectiontools/KisToolSelectPath.action
	M			plugins/tools/selectiontools/KisToolSelectPolygonal.action
	M			plugins/tools/selectiontools/KisToolSelectRectangular.action
	M			plugins/tools/selectiontools/KisToolSelectSimilar.action
	M			plugins/tools/svgtexttool/SvgTextTool.action
	M			plugins/tools/tool_crop/KisToolCrop.action
	M			plugins/tools/tool_polygon/KisToolPolygon.action
	M			plugins/tools/tool_polyline/KisToolPolyline.action
	M			plugins/tools/tool_transform2/KisToolTransform.action
	M			plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp