Merge branch 'amedonosova/gamut-masking' into 'master'
64a2e33f8b8a
Actions

Authored by amedonosova on Aug 16 2019, 2:15 PM.

Description

Merge branch 'amedonosova/gamut-masking' into 'master'

Show gamut mask in the pop-up color selector

See merge request kde/krita!111

Committed

amedonosova

Aug 16 2019, 2:15 PM

Parents

Branches

Unknown

Tags

Unknown

References

refs/merge-requests/111/merge

	Commit			Author	Details	Committed
	0cc84daa0a85			amedonosova	Show gamut mask in the on-canvas color selector	Aug 16 2019
	35d7895167df			amedonosova	Gamut masking: share activation state in KisCanvasResourceProvider	Aug 16 2019

				Path	Packages
	M			libs/ui/kis_canvas_resource_provider.cpp
	M			libs/ui/kis_canvas_resource_provider.h
	M			libs/ui/widgets/KisGamutMaskToolbar.cpp
	M			libs/ui/widgets/KisGamutMaskToolbar.h
	M			plugins/dockers/advancedcolorselector/kis_color_selector.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector.h
	M			plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp
	M			plugins/dockers/artisticcolorselector/artisticcolorselector_dock.cpp
	M			plugins/dockers/artisticcolorselector/artisticcolorselector_dock.h