Diffusion Krita 3109e7b84bd7

Merge remote-tracking branch 'dkazakov/preserve-lightness-brush'
3109e7b84bd7
Actions

Authored by dkazakov on Apr 7 2020, 9:40 PM.

Description

Merge remote-tracking branch 'dkazakov/preserve-lightness-brush'

Conflicts:
libs/brush/CMakeLists.txt
libs/brush/kis_brush.cpp
libs/brush/kis_gbr_brush.cpp
libs/brush/kis_imagepipe_brush.cpp
libs/brush/kis_imagepipe_brush.h
libs/brush/kis_predefined_brush_factory.cpp
plugins/paintops/libpaintop/forms/wdgclipboardbrush.ui
plugins/paintops/libpaintop/kis_brush_chooser.cpp
plugins/paintops/libpaintop/kis_brush_chooser.h
plugins/paintops/libpaintop/kis_custom_brush_widget.cpp

Details

Committed

dkazakov

Apr 8 2020, 1:40 PM

Parents

R37:4070d4492f89: Fix "Reset predefined tip" button actually reset lightness options
R37:7db236a20f6d: AnimationRenderer Readded Constructor Items for UniqueFrames Only

Branches

Unknown

Tags

Unknown

dkazakov committed R37:3109e7b84bd7: Merge remote-tracking branch 'dkazakov/preserve-lightness-brush' (authored by dkazakov).Apr 8 2020, 1:40 PM

Merged Changes

Commit	Author	Details	Committed
4070d4492f89	dkazakov	Fix "Reset predefined tip" button actually reset lightness options	Apr 3 2020
ba0f35d07b4e	dkazakov	Remove asserts in KisPredefinedBrushChooser	Apr 3 2020
7e3f6c7690b9	dkazakov	Add the latest lightness blending algorithm by Peter Schatz	Apr 3 2020
ddd2a774f2b4	dkazakov	Fix hiccups when zooming with a tablet	Apr 2 2020
5ef8178269fe	dkazakov	Extract brush mode options into a separate class KisColorfulBrush	Mar 31 2020
1f19dc4d739a	dkazakov	Add tooltips to the newly added brush settings	Mar 31 2020
dc05c8fc033f	dkazakov	Implement "Neutral Point" feature for lightness overlay brush	Mar 30 2020
3153d479c9c0	dkazakov	Implement GUI for adjusting lightness-based brushes	Mar 30 2020
fc0572af7462	dkazakov	Fix copy-ctor of the PNG brush	Mar 27 2020
64a6011e7305	dkazakov	Fix broken ColorSmudge engine	Mar 26 2020
256d014e3fc1	dkazakov	Optimize Auto Brush by merging fill and mask passes into one	Mar 25 2020
c20f887d1c16	dkazakov	Fix "Preserve Lightness" being enabled when it shouldn't be	Mar 25 2020
4064d50aa273	dkazakov	Fix "Preserve Lightness" to work with all color spaces	Mar 25 2020
264d9423faef	Peter Schatz/dkazakov	Add "Create Mask from Color" predefined brush option preserve alpha	Mar 24 2020

Changes (46)

				Path	Packages
	M			benchmarks/kis_mask_generator_benchmark.cpp
	M			libs/brush/CMakeLists.txt
	A			libs/brush/KisColorfulBrush.cpp
	A			libs/brush/KisColorfulBrush.h
	M			libs/brush/kis_auto_brush.cpp
	M			libs/brush/kis_brush.cpp
	M			libs/brush/kis_brush.h
	M			libs/brush/kis_brushes_pipe.h
	M			libs/brush/kis_gbr_brush.cpp
	M			libs/brush/kis_gbr_brush.h
	M			libs/brush/kis_imagepipe_brush.cpp
	M			libs/brush/kis_imagepipe_brush.h
	M			libs/brush/kis_png_brush.cpp
	M			libs/brush/kis_png_brush.h
	M			libs/brush/kis_predefined_brush_factory.cpp
	M			libs/brush/kis_scaling_size_brush.cpp
	M			libs/brush/kis_text_brush.cpp
	M			libs/brush/tests/kis_imagepipe_brush_test.cpp
	M			libs/image/kis_brush_mask_applicator_base.h
	M			libs/image/kis_brush_mask_applicators.h
	M			libs/image/tests/KisMaskGeneratorTest.cpp
	M			libs/image/tests/kis_mask_similarity_test.cpp
	M			libs/pigment/KoColorSpace.cpp
	M			libs/pigment/KoColorSpace.h
	M			libs/pigment/KoColorSpaceAbstract.h
	A			libs/pigment/KoColorSpacePreserveLightnessUtils.h
	M			libs/pigment/KoColorSpaceTraits.h
	M			libs/pigment/colorspaces/KoRgbU16ColorSpace.cpp
	M			libs/pigment/colorspaces/KoRgbU16ColorSpace.h
	M			libs/pigment/colorspaces/KoRgbU8ColorSpace.cpp
	M			libs/pigment/colorspaces/KoRgbU8ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_f16/RgbF16ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_f16/RgbF16ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_f32/RgbF32ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_f32/RgbF32ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_u16/RgbU16ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_u16/RgbU16ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.h
	M			plugins/paintops/libpaintop/forms/wdgclipboardbrush.ui
	M			plugins/paintops/libpaintop/forms/wdgcustombrush.ui
	M			plugins/paintops/libpaintop/forms/wdgpredefinedbrushchooser.ui
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.h
	M			plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
	M			plugins/paintops/libpaintop/kis_custom_brush_widget.cpp