Merge branch 'master' into wolthera/imagesplit_with_guides
6a76b6be725b
Actions

Authored by woltherav on Apr 20 2020, 7:58 PM.

Description

Merge branch 'master' into wolthera/imagesplit_with_guides

Committed

woltherav

Apr 20 2020, 7:58 PM

Parents

Branches

Unknown

Tags

Unknown

References

Commit	Author	Details	Committed
94a83a77a472	tymond	Fix assert on Node::parentNode() for root	Apr 20 2020
4a37f35f9a5c	Daniel Wilches/rempt	Fix colorize mask for more than 16 colors	Apr 17 2020
44e3f62e110c	emmetoneill	Rename Action: "Isolate Layer" -> "Isolate Active Layer"	Apr 17 2020
7b61f8765a8b	eoinoneill	Corrections for PaintDevice::createKeyframeChannel and KeyframeChannel…	Apr 17 2020
92341b2241e0	eoinoneill	Correction to `KisKeyframeChannel::affectedFrames` Segfault	Apr 17 2020
adbe90fd47dc	dkazakov	Make sanity checks in KisTiledDataManager more strict	Apr 16 2020
63af6bb0961d	dkazakov	Disable automatical purging of default pixels	Apr 16 2020
b20c64b04b53	dkazakov	Remove unused implementation of KoCompositeOpCopy	Apr 16 2020

				Path	Packages
	M			krita/data/shortcuts/krita_default.shortcuts
	M			krita/data/shortcuts/paint_tool_sai_compatible.shortcuts
	M			krita/data/shortcuts/photoshop_compatible.shortcuts
	M			krita/data/shortcuts/tablet_pro.shortcuts
	M			krita/krita.action
	M			libs/image/kis_image.cc
	M			libs/image/kis_keyframe_channel.cpp
	M			libs/image/kis_keyframe_channel.h
	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/tiles3/kis_memento_manager.cc
	M			libs/image/tiles3/kis_memento_manager.h
	M			libs/image/tiles3/kis_tiled_data_manager.h
	M			libs/libkis/Node.cpp
	D			libs/pigment/compositeops/KoCompositeOpCopy.h
	M			libs/pigment/resources/KisSwatchGroup.h
	M			libs/ui/KisDocument.cpp
	M			libs/ui/kis_node_manager.cpp
	M			plugins/dockers/layerdocker/LayerBox.cpp
	M			plugins/tools/tool_lazybrush/kis_tool_lazy_brush_options_widget.cpp
	M			plugins/tools/tool_lazybrush/kis_tool_lazy_brush_options_widget.h