[Bf-blender-cvs] [6d0e92cf0a7] geometry-nodes: Geometry Nodes: protect object from instancing itself directly
Jacques Lucke
noreply at git.blender.org
Thu Nov 26 18:22:49 CET 2020
Commit: 6d0e92cf0a7546d968d4f6d4e005aea594156125
Author: Jacques Lucke
Date: Thu Nov 26 18:03:10 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rB6d0e92cf0a7546d968d4f6d4e005aea594156125
Geometry Nodes: protect object from instancing itself directly
This is not a perfect check, because it does not check instances recursivly.
However, it helps protect us from the most common mistake.
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
index 2133d5fe65e..bb8f1ff4909 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
@@ -60,7 +60,7 @@ static void geo_node_point_instance_exec(GeoNodeExecParams params)
"Object");
Object *object = params.handle_map().lookup(object_handle);
- if (object != nullptr) {
+ if (object != nullptr && object != params.self_object()) {
InstancesComponent &instances = geometry_set_out.get_component_for_write<InstancesComponent>();
if (geometry_set.has<MeshComponent>()) {
add_instances_from_geometry_component(
More information about the Bf-blender-cvs
mailing list