#5725: Allow merge action nodes to be hidden

codereader · Aug 29, 2021 · e2cc8f7 · e2cc8f7
1 parent 2ec677c
commit e2cc8f7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/libs/scene/merge/MergeActionNode.cpp b/libs/scene/merge/MergeActionNode.cpp
@@ -10,6 +10,12 @@ MergeActionNodeBase::MergeActionNodeBase() :
 void MergeActionNodeBase::prepareForMerge()
 {
     _syncActionStatus = false;
+
+    // Unhide ourselves before merging
+    if (checkStateFlag(eHidden))
+    {
+        disable(eHidden);
+    }
 }
 
 INodePtr MergeActionNodeBase::getAffectedNode()
@@ -68,7 +74,7 @@ INode::Type MergeActionNodeBase::getNodeType() const
 
 bool MergeActionNodeBase::supportsStateFlag(unsigned int state) const
 {
-    if ((state & (eHidden | eFiltered | eExcluded | eLayered)) != 0)
+    if ((state & (eFiltered | eExcluded | eLayered)) != 0)
     {
         return false; // don't allow this node to be hidden
     }