[krita/krita/4.2] /: Set "Show in Timeline" to "on" by default

Dmitry Kazakov null at kde.org
Sat Sep 14 16:19:51 BST 2019


Git commit b57792d852bb7f1abc3fca08c4ac3b4a19b941b8 by Dmitry Kazakov.
Committed on 14/09/2019 at 15:07.
Pushed by dkazakov into branch 'krita/4.2'.

Set "Show in Timeline" to "on" by default

During the sprint we discussed that with painters and they said that
it would be much easier for them if all the layers would be visible
in the timeline by default. If the user can always hide a layer if
he likes.

CC:kimageshop at kde.org

M  +1    -1    libs/image/kis_base_node.cpp
M  +1    -1    plugins/dockers/animation/timeline_frames_index_converter.cpp

https://invent.kde.org/kde/krita/commit/b57792d852bb7f1abc3fca08c4ac3b4a19b941b8

diff --git a/libs/image/kis_base_node.cpp b/libs/image/kis_base_node.cpp
index 653cc0ccea..5ae959f51a 100644
--- a/libs/image/kis_base_node.cpp
+++ b/libs/image/kis_base_node.cpp
@@ -51,7 +51,7 @@ struct Q_DECL_HIDDEN KisBaseNode::Private
         , collapsed(false)
         , supportsLodMoves(false)
         , animated(false)
-        , useInTimeline(false)
+        , useInTimeline(true)
         , image(image)
     {
     }
diff --git a/plugins/dockers/animation/timeline_frames_index_converter.cpp b/plugins/dockers/animation/timeline_frames_index_converter.cpp
index 17c964f8db..34fefc1513 100644
--- a/plugins/dockers/animation/timeline_frames_index_converter.cpp
+++ b/plugins/dockers/animation/timeline_frames_index_converter.cpp
@@ -135,5 +135,5 @@ void TimelineFramesIndexConverter::notifyDummyRemoved(KisNodeDummy *dummy)
 
 bool TimelineFramesIndexConverter::isDummyVisible(KisNodeDummy *dummy) const
 {
-    return dummy->node()->useInTimeline() || dummy == m_activeDummy;
+    return (dummy->node()->useInTimeline() && dummy->parent()) || dummy == m_activeDummy;
 }



More information about the kimageshop mailing list