[Bf-blender-cvs] [813425877b6] master: Geometry Nodes: propagate material from guides in Interpolate Curves node

Jacques Lucke noreply at git.blender.org
Tue Jan 24 16:24:08 CET 2023


Commit: 813425877b632e3e1ddeaaa9ef6f3a0367e46fb1
Author: Jacques Lucke
Date:   Tue Jan 24 16:24:00 2023 +0100
Branches: master
https://developer.blender.org/rB813425877b632e3e1ddeaaa9ef6f3a0367e46fb1

Geometry Nodes: propagate material from guides in Interpolate Curves node

This was missing from the original implementation.

===================================================================

M	source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc

===================================================================

diff --git a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
index c4f275334a8..dc3b24e4fae 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
@@ -747,6 +747,11 @@ static GeometrySet generate_interpolated_curves(
                           all_neighbor_indices,
                           all_neighbor_weights);
 
+  if (guide_curves_id.mat != nullptr) {
+    child_curves_id->mat = static_cast<Material **>(MEM_dupallocN(guide_curves_id.mat));
+    child_curves_id->totcol = guide_curves_id.totcol;
+  }
+
   return GeometrySet::create_with_curves(child_curves_id);
 }



More information about the Bf-blender-cvs mailing list