Merge branch 'krita-eraser-mode-kazakov' into kazakov-interruptions-T1946
44e0ced30901
Actions

Authored by dkazakov on Mar 29 2016, 9:40 AM.

Description

Merge branch 'krita-eraser-mode-kazakov' into kazakov-interruptions-T1946

Committed

dkazakov

Mar 29 2016, 9:40 AM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
7804cca492b1	dkazakov	Fix a layer selection bug when pasting a layer with Ctrl+V shortcut	Mar 24 2016
6b15b9ae7636	dkazakov	Added API docs for the derived resources	Mar 23 2016
591b4f7541ff	dkazakov	Fix resetting Erase mode when changing the color	Mar 23 2016
1e81d7244201	dkazakov	Implemented a correct eraser mode for the paintop presets	Mar 23 2016
dc0bb8c05aa0	dkazakov	Fix a bug in derived resources implementation	Mar 23 2016
857fed43695b	dkazakov	Added ability to KoResourceManager to support "derived" resources	Mar 21 2016

				Path	Packages
	M			krita/sketch/KisSketchView.cpp
	M			libs/flake/CMakeLists.txt
	M			libs/flake/KoCanvasResourceManager.cpp
	M			libs/flake/KoCanvasResourceManager.h
	P			libs/flake/KoDerivedResourceConverter.cpp Copied from libs/ui/canvas/kis_snap_config.cpp
	A			libs/flake/KoDerivedResourceConverter.h
	M			libs/flake/KoDocumentResourceManager.cpp
	M			libs/flake/KoResourceManager_p.cpp
	M			libs/flake/KoResourceManager_p.h
	M			libs/flake/tests/TestResourceManager.cpp
	M			libs/flake/tests/TestResourceManager.h
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/image/brushengine/kis_paintop_settings.h
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisView.cpp
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/kis_canvas_resource_provider.cpp
	M			libs/ui/kis_canvas_resource_provider.h
	A			libs/ui/kis_derived_resources.cpp
	A			libs/ui/kis_derived_resources.h
	A			libs/ui/kis_highlighted_button.h
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_box.h
	M			libs/ui/tool/kis_resources_snapshot.cpp
	M			plugins/paintops/libpaintop/kis_compositeop_option.cpp
	M			plugins/paintops/libpaintop/kis_compositeop_option.h