Merge down should not remove locked layers
556dd7e90221
Actions

Authored by nsmirnov on Oct 3 2017, 8:44 AM.

Description

Merge down should not remove locked layers

Reviewers: Krita, dkazakov

Subscribers: rempt

Committed

rempt

Oct 9 2017, 8:23 AM

Differential Revision

D7394: merge down update

Parents

R37:f0adb2129833: fix timer being swamped

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			libs/image/CMakeLists.txt
	A			libs/image/commands/kis_image_change_visibility_command.cpp
	A			libs/image/commands/kis_image_change_visibility_command.h
	M			libs/image/commands/kis_image_commands.h
	M			libs/image/kis_layer_utils.cpp
	M			libs/ui/kis_layer_manager.cc