[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita] libs/ui: Fix convert layer to Paint layer logic. If it's a group layer or a layer with layer
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2016-08-13 15:27:10
Message-ID: E1bYaq6-0005xp-9G () code ! kde ! org
[Download RAW message or body]

Git commit 3480a5f3b863e66c439a0fbce69db6cb725bb2ba by Sven Langkamp.
Committed on 13/08/2016 at 15:26.
Pushed by langkamp into branch 'master'.

Fix convert layer to Paint layer logic. If it's a group layer or a layer with layer \
styles, flatten is used

M  +2    -2    libs/ui/kis_layer_manager.cc

http://commits.kde.org/krita/3480a5f3b863e66c439a0fbce69db6cb725bb2ba

diff --git a/libs/ui/kis_layer_manager.cc b/libs/ui/kis_layer_manager.cc
index 5eef42e..df1f13c 100644
--- a/libs/ui/kis_layer_manager.cc
+++ b/libs/ui/kis_layer_manager.cc
@@ -350,8 +350,8 @@ void KisLayerManager::convertNodeToPaintLayer(KisNodeSP source)
     if (!image) return;
 
 
-    KisGroupLayer *srcLayer = dynamic_cast<KisGroupLayer*>(source.data());
-    if (srcLayer) {
+    KisLayer *srcLayer = dynamic_cast<KisLayer*>(source.data());
+    if (srcLayer && (srcLayer->inherits("KisGroupLayer") || srcLayer->layerStyle())) \
{  image->flattenLayer(srcLayer);
         return;
     }


[prev in list] [next in list] [prev in thread] [next in thread]