Diffusion Krita 59aa2bbcfc52

Merge branch 'master' into rempt/T379-resource-management
59aa2bbcfc52
Actions

Authored by rempt on Jun 8 2018, 10:57 AM.

Tags

None

Subscribers

None

Description

Merge branch 'master' into rempt/T379-resource-management

Details

Committed

Jun 8 2018, 10:57 AM

Parents

R37:0da7f65c417d: Fix KisResourceLocator and test
R37:d183945d306b: Fix painting layer styles in Inherit Alpha mode

Branches

Unknown

Tags

Unknown

rempt committed R37:59aa2bbcfc52: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Jun 8 2018, 10:57 AM

Merged Changes

	Commit			Author	Details	Committed
	d183945d306b			dkazakov	Fix painting layer styles in Inherit Alpha mode	Jun 8 2018

Changes (16)

				Path	Packages
	M			libs/image/kis_cached_paint_device.h
	M			libs/image/kis_fill_painter.cc
	M			libs/image/kis_fill_painter.h
	M			libs/image/layerstyles/kis_layer_style_filter_projection_plane.cpp
	M			libs/image/layerstyles/kis_ls_bevel_emboss_filter.cpp
	M			libs/image/layerstyles/kis_ls_overlay_filter.cpp
	M			libs/image/layerstyles/kis_ls_overlay_filter.h
	M			libs/image/layerstyles/kis_ls_stroke_filter.cpp
	M			libs/image/layerstyles/kis_ls_utils.cpp
	M			libs/image/layerstyles/kis_multiple_projection.cpp
	M			libs/image/layerstyles/kis_multiple_projection.h
	A			libs/image/tests/data/fill_painter/patterns_fill__custom_origin.png
	A			libs/image/tests/data/fill_painter/patterns_fill__null_origin.png
	M			libs/image/tests/kis_fill_painter_test.cpp
	M			libs/image/tests/kis_fill_painter_test.h
	M			libs/image/tests/kis_layer_styles_test.cpp

R37:59aa2bbcfc52

libs/image/kis_cached_paint_device.h

Loading...

libs/image/kis_fill_painter.cc

Loading...

libs/image/kis_fill_painter.h

Loading...

libs/image/layerstyles/kis_layer_style_filter_projection_plane.cpp

Loading...

libs/image/layerstyles/kis_ls_bevel_emboss_filter.cpp

Loading...

libs/image/layerstyles/kis_ls_overlay_filter.cpp

Loading...

libs/image/layerstyles/kis_ls_overlay_filter.h

Loading...

libs/image/layerstyles/kis_ls_stroke_filter.cpp

Loading...

libs/image/layerstyles/kis_ls_utils.cpp

Loading...

libs/image/layerstyles/kis_multiple_projection.cpp

Loading...

libs/image/layerstyles/kis_multiple_projection.h

Loading...

libs/image/tests/data/fill_painter/patterns_fill__custom_origin.png

Loading...

libs/image/tests/data/fill_painter/patterns_fill__null_origin.png

Loading...

libs/image/tests/kis_fill_painter_test.cpp

Loading...

libs/image/tests/kis_fill_painter_test.h

Loading...

libs/image/tests/kis_layer_styles_test.cpp

Loading...