Diffusion Krita 8947c5725a05

Merge branch 'master' of invent.kde.org:kde/krita
8947c5725a05
Actions

Authored by shiyan on Nov 5 2019, 9:34 PM.

Description

Merge branch 'master' of invent.kde.org:kde/krita

Details

Committed

shiyan

Nov 5 2019, 9:34 PM

Parents

R37:5a6673dc3cf8: add recorder plugin
R37:179649cf5a83: Fix regression (deadlock) when loading .kra with non-default color prfofile

Branches

Unknown

Tags

Unknown

References

refs/keep-around/8947c5725a052bc4d7b72fde4569be1ba5a28477

shiyan committed R37:8947c5725a05: Merge branch 'master' of invent.kde.org:kde/krita (authored by shiyan).Nov 5 2019, 9:34 PM

Merged Changes

Commit	Author	Details	Committed
179649cf5a83	dkazakov	Fix regression (deadlock) when loading .kra with non-default color prfofile	Nov 5 2019
e7ad756d3f32	dkazakov	Restore Image->Properties to have an option to convert projection-only	Nov 5 2019
a51477848d6c	dkazakov	Rename "Convert Layer Type" -> "Convert Layer Color Space"	Nov 5 2019
02ba224bd077	dkazakov	Fix info text in Image->Properties dialog	Nov 5 2019
74caf095212f	dkazakov	Implement Undo/Redo of Inherit and Lock Alpha when color space is converted	Nov 5 2019
e39e6379564b	dkazakov	Fix undo of image colorspace conversion	Nov 5 2019
9dfaf557d4d9	dkazakov	Convert Shape Layers' color space and profile alongside the image	Nov 5 2019
88a343fde1de	dkazakov	Implement undoable and thread-safe Assign Profile functionality	Nov 5 2019
003ffcff6019	dkazakov	Optimize KisProcessingCommand	Nov 5 2019
ccf5657ac87a	dkazakov	Fix random crashes when converting image color space	Nov 5 2019
9591e52bbe74	rempt	Create temporary files in the temp dir	Nov 5 2019

Changes (55)

				Path	Packages
	M			libs/image/CMakeLists.txt
	M			libs/image/commands/kis_image_commands.h
	D			libs/image/commands/kis_image_set_projection_color_space_command.cpp
	D			libs/image/commands/kis_image_set_projection_color_space_command.h
	A			libs/image/commands_new/KisChangeChannelFlagsCommand.cpp
	P			libs/image/commands_new/KisChangeChannelFlagsCommand.h Copied from libs/image/commands/kis_reselect_global_selection_command.h
	A			libs/image/commands_new/KisChangeChannelLockFlagsCommand.cpp
	P			libs/image/commands_new/KisChangeChannelLockFlagsCommand.h Copied from libs/image/commands/kis_reselect_global_selection_command.h
	M			libs/image/commands_new/kis_processing_command.cpp
	D			libs/image/kis_change_profile_visitor.h
	D			libs/image/kis_colorspace_convert_visitor.cpp
	D			libs/image/kis_colorspace_convert_visitor.h
	M			libs/image/kis_do_something_command.h
	M			libs/image/kis_external_layer_iface.h
	M			libs/image/kis_image.cc
	M			libs/image/kis_image.h
	M			libs/image/kis_paint_device.cc
	M			libs/image/kis_paint_device.h
	M			libs/image/kis_paint_device_data.h
	M			libs/image/kis_processing_applicator.cpp
	M			libs/image/kis_processing_applicator.h
	M			libs/image/kis_transform_mask.cpp
	M			libs/image/lazybrush/kis_colorize_mask.cpp
	M			libs/image/lazybrush/kis_colorize_mask.h
	A			libs/image/processing/kis_assign_profile_processing_visitor.cpp
	P			libs/image/processing/kis_assign_profile_processing_visitor.h Copied from libs/image/processing/kis_crop_processing_visitor.h
	A			libs/image/processing/kis_convert_color_space_processing_visitor.cpp
	P			libs/image/processing/kis_convert_color_space_processing_visitor.h Copied from libs/image/processing/kis_crop_processing_visitor.h
	M			libs/image/tests/CMakeLists.txt
	D			libs/image/tests/kis_change_profile_visitor_test.cpp
	D			libs/image/tests/kis_change_profile_visitor_test.h
	D			libs/image/tests/kis_colorspace_convert_visitor_test.cpp
	D			libs/image/tests/kis_colorspace_convert_visitor_test.h
	M			libs/image/tests/kis_image_test.cpp
	M			libs/image/tests/kis_image_test.h
	M			libs/libkis/Document.cpp
	M			libs/libkis/Node.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisImportExportManager.cpp
	M			libs/ui/canvas/kis_display_color_converter.cpp
	M			libs/ui/dialogs/kis_dlg_image_properties.cc
	M			libs/ui/dialogs/kis_dlg_image_properties.h
	M			libs/ui/flake/KisReferenceImagesLayer.cpp
	M			libs/ui/flake/KisReferenceImagesLayer.h
	M			libs/ui/flake/kis_shape_layer.cc
	M			libs/ui/flake/kis_shape_layer.h
	M			libs/ui/forms/wdgimageproperties.ui
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_image_manager.cc
	M			plugins/extensions/colorspaceconversion/colorspaceconversion.cc
	M			plugins/impex/libkra/kis_kra_load_visitor.cpp
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/psd/psd_saver.cpp
	M			sdk/tests/filestest.h