Enable state was not taken into account when pasting a Block (Unity-T…

…echnologies#6575) * Enable state was not taken into account when pasting a Block * Take enabled/disabled state into account when creating subgraphs * Updated changelog
softant2008 · Dec 16, 2021 · b4f512b · b4f512b
1 parent 7647e11
commit b4f512b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Creating a new VFX of the same name as an already opened VFX will reuse the existing window [Case 1382841](https://issuetracker.unity3d.com/product/unity/issues/guid/1382841/)
 - Incorrect behavior of Tangent Space in ShaderGraph [Case 1363279](https://issuetracker.unity3d.com/product/unity/issues/guid/1363279/)
 - ShaderGraph made with new VFX SG integration where not listed when searching for a shader graph output [Case 1379523](https://issuetracker.unity3d.com/product/unity/issues/guid/1379523/)
+- Enable/disable state of VFX blocks and operators are preserved after copy/paste
+
 
 ## [13.1.2] - 2021-11-05
 

diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopy.cs b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopy.cs
@@ -289,11 +289,11 @@ NodeID CopyNode(ref Node node, VFXModel model, uint index)
             // Copy node infos
             node.position = model.position;
             node.type = model.GetType();
-            node.flags = 0;
+            node.flags = (model as VFXBlock)?.enabled != false ? Node.Flags.Enabled : 0;
             if (model.collapsed)
-                node.flags = Node.Flags.Collapsed;
+                node.flags |= Node.Flags.Collapsed;
             if (model.superCollapsed)
-                node.flags = Node.Flags.SuperCollapsed;
+                node.flags |= Node.Flags.SuperCollapsed;
 
             uint id = 0;
             if (model is VFXOperator)

diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXPaste.cs b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXPaste.cs
@@ -143,6 +143,7 @@ private int PasteBlocks(VFXViewController viewController, Node[] blocks, VFXCont
             {
                 Node blk = block;
                 VFXBlock newBlock = PasteAndInitializeNode<VFXBlock>(viewController, ref blk);
+                newBlock.enabled = (blk.flags & Node.Flags.Enabled) == Node.Flags.Enabled;
 
                 if (targetModelContext.AcceptChild(newBlock, targetIndex))
                 {