DynamoDS
diff --git a/‎src/DynamoCoreWpf/Rendering/HelixRenderPackage.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCoreWpf/Rendering/HelixRenderPackage.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/DynamoCoreWpf/ViewModels/Watch3D/HelixWatch3DViewModel.cs
Copy file name to clipboard
+173-60Lines changed: 173 additions & 60 deletions b/‎src/DynamoCoreWpf/ViewModels/Watch3D/HelixWatch3DViewModel.cs
Copy file name to clipboard
+173-60Lines changed: 173 additions & 60 deletions
diff --git a/‎src/VisualizationTests/HelixImageComparisonTests.cs
Copy file name to clipboard
+12-1Lines changed: 12 additions & 1 deletion b/‎src/VisualizationTests/HelixImageComparisonTests.cs
Copy file name to clipboard
+12-1Lines changed: 12 additions & 1 deletion
diff --git a/‎src/VisualizationTests/HelixWatch3DViewModelTests.cs
Copy file name to clipboard
+37-3Lines changed: 37 additions & 3 deletions b/‎src/VisualizationTests/HelixWatch3DViewModelTests.cs
Copy file name to clipboard
+37-3Lines changed: 37 additions & 3 deletions
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Autodesk.DesignScript.Interfaces;
 
@@ -1,4 +1,4 @@
-
+
 //UNCOMMENT THIS DEFINE TO UPDATE THE REFERENCE IMAGES.
 //#define UPDATEIMAGEDATA
 //UNCOMMENT TO SAVE DEBUG IMAGES.
@@ -334,6 +334,17 @@ public void RenderMeshInstances_noInstanceData()
             RunCurrentModel();
             RenderCurrentViewAndCompare(MethodBase.GetCurrentMethod().Name);
         }
+        [Test]
+        public void RenderInstancingWithEdges()
+        {
+            // Regression test for DYN-5329: 
+            // Rendering instances and multiple texture maps fails when edges are on.
+
+            OpenVisualizationTest("MultipleTextureMaps.dyn");
+            ViewModel.RenderPackageFactoryViewModel.ShowEdges = true;
+            RunCurrentModel();
+            RenderCurrentViewAndCompare(MethodBase.GetCurrentMethod().Name);
+        }
 
         #endregion
 
 
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
@@ -9,11 +9,13 @@
 using System.Windows.Input;
 using System.Windows.Media.Media3D;
 using System.Xml;
+using CoreNodeModels;
 using CoreNodeModels.Input;
 using Dynamo;
 using Dynamo.Controls;
 using Dynamo.Graph;
 using Dynamo.Graph.Nodes;
+using Dynamo.Graph.Notes;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
 using Dynamo.Scheduler;
@@ -22,6 +24,8 @@
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
 using Dynamo.Views;
+using Dynamo.Visualization;
+using Dynamo.Wpf.Rendering;
 using Dynamo.Wpf.ViewModels.Watch3D;
 using DynamoCoreWpfTests.Utility;
 using DynamoShapeManager;
@@ -1183,7 +1187,37 @@ public void CanTagGeometryWhenClickingArrayItemInWatchNode()
             tagGeometryWhenClickingItem(new[] { 0 }, 11, "Watch", 
                 n => n.ViewModel.NodeModel.InPorts[0].Connectors[0].Start.Owner);
         }
-        
+
+        [Test]
+        [Category("RegressionTests")]
+        public void AggregateRenderPackagesDoesntMutateRenderPackage()
+        {
+            // Regression test for DYN-5329:
+            // HelixWatch3DViewModel.AggregateRenderPackages event handler shouldn't mutate render packages.
+
+            OpenVisualizationTest("MultipleTextureMaps.dyn");
+
+            var output = ViewModel.CurrentSpace.NodeFromWorkspace<CreateList>(Guid.Parse("04fcc9b7f80b43c99923b0dac8930e77"));
+
+            output.RenderPackagesUpdated += TestRenderPackageUpdate;
+
+            output.RequestVisualUpdateAsync(ViewModel.Model.Scheduler, ViewModel.Model.EngineController, new HelixRenderPackageFactory(), true);
+        }
+
+        private void TestRenderPackageUpdate(NodeModel nodeModel, RenderPackageCache renderPackages) {
+            nodeModel.RenderPackagesUpdated -= TestRenderPackageUpdate;
+
+            if (renderPackages.Packages.FirstOrDefault() is HelixRenderPackage package)
+            {
+                // The graph output contains 168 mesh vertices.
+                // Before DYN-5329 we removed the parts of the mesh containing multiple texture maps after adding them to the scene.
+                Assert.AreEqual(168, package.Mesh.Positions.Count);
+            } else
+            {
+                throw new Exception("Could not find HelixRenderPackage?");
+            }
+        }
+
         private async void tagGeometryWhenClickingItem(int[] indexes, int expectedNumberOfLabels, 
             string nodeName, Func<NodeView,NodeModel> getGeometryOwnerNode, bool expandPreviewBubble = false)
         {
@@ -1308,7 +1342,7 @@ public void InstancedMeshesAndLinesAreAddedToBackGroundPreviewForEachMatrixWhenS
             Assert.AreEqual(0, BackgroundPreviewGeometry.NumberOfVisibleCurves());
             ViewModel.RenderPackageFactoryViewModel.ShowEdges = true;
             //this graph displays a grid, cones, cone edges, cube instances, cube edge instances.
-            Assert.AreEqual(3, BackgroundPreviewGeometry.NumberOfVisibleCurves());
+            Assert.AreEqual(2, BackgroundPreviewGeometry.NumberOfVisibleCurves());
             //cone and mesh
             Assert.AreEqual(2, BackgroundPreviewGeometry.NumberOfVisibleMeshes());
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using Autodesk.DesignScript.Interfaces;`