[Bf-blender-cvs] [6c906b7c219] master: Fix T94707: inverted output of separate geometry node incorrect
Jacques Lucke
noreply at git.blender.org
Fri Jan 7 08:11:36 CET 2022
Commit: 6c906b7c219f3fdf9489856de03d0124e854c982
Author: Jacques Lucke
Date: Fri Jan 7 08:06:09 2022 +0100
Branches: master
https://developer.blender.org/rB6c906b7c219f3fdf9489856de03d0124e854c982
Fix T94707: inverted output of separate geometry node incorrect
This was an oversight in rB3e92b4ed2408eacd126c0.
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc
index 63da7399c3e..fec1ac1363e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc
@@ -59,7 +59,7 @@ static void node_geo_exec(GeoNodeExecParams params)
const NodeGeometrySeparateGeometry &storage = node_storage(params.node());
const AttributeDomain domain = static_cast<AttributeDomain>(storage.domain);
- auto separate_geometry_maybe_recursively = [&](bool invert) {
+ auto separate_geometry_maybe_recursively = [&](GeometrySet &geometry_set, bool invert) {
bool is_error;
if (domain == ATTR_DOMAIN_INSTANCE) {
/* Only delete top level instances. */
@@ -84,11 +84,11 @@ static void node_geo_exec(GeoNodeExecParams params)
GeometrySet second_set(geometry_set);
if (params.output_is_required("Selection")) {
- separate_geometry_maybe_recursively(false);
+ separate_geometry_maybe_recursively(geometry_set, false);
params.set_output("Selection", std::move(geometry_set));
}
if (params.output_is_required("Inverted")) {
- separate_geometry_maybe_recursively(true);
+ separate_geometry_maybe_recursively(second_set, true);
params.set_output("Inverted", std::move(second_set));
}
}
More information about the Bf-blender-cvs
mailing list