[Bf-blender-cvs] [e5e295beeda] functions: fix when having emitter in node group

Jacques Lucke noreply at git.blender.org
Wed Dec 4 11:53:55 CET 2019


Commit: e5e295beedae29193c8e5f607f677dd2c5c612d5
Author: Jacques Lucke
Date:   Wed Dec 4 11:53:15 2019 +0100
Branches: functions
https://developer.blender.org/rBe5e295beedae29193c8e5f607f677dd2c5c612d5

fix when having emitter in node group

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

M	source/blender/simulations/bparticles/node_frontend.cpp

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

diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index 558a1669adb..c42213fe3ae 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -563,7 +563,7 @@ static void PARSE_mesh_emitter(InfluencesCollector &collector,
   auto vertex_weights = compute_emitter_vertex_weights(xnode, *inputs, object);
 
   VaryingFloat4x4 transform = world_transition.update_float4x4(
-      xnode.name(), "Transform", object->obmat);
+      object->id.name, "obmat", object->obmat);
   ArrayRef<std::string> system_names = inlined_tree_data.find_target_system_names(
       xnode.output(0, "Emitter"));
   Emitter *emitter = new SurfaceEmitter(system_names,



More information about the Bf-blender-cvs mailing list