[Bf-blender-cvs] [ae865844040] master: Geometry Nodes: Points to Volume Fields fixes
Johnny Matthews guitargeek
noreply at git.blender.org
Sun Oct 3 20:50:47 CEST 2021
Commit: ae865844040c084ca650376bbfdda3cc9998f2d2
Author: Johnny Matthews (guitargeek)
Date: Sun Oct 3 13:43:51 2021 -0500
Branches: master
https://developer.blender.org/rBae865844040c084ca650376bbfdda3cc9998f2d2
Geometry Nodes: Points to Volume Fields fixes
A few items when OpenVDB is not enabled.
- Cleanup a compiler warning
- Add a node warning message
- Return an empty geometry set
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
index 4a51d485b85..719523f64f0 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
@@ -241,13 +241,16 @@ static void geo_node_points_to_volume_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
- geometry_set.modify_geometry_sets([&](GeometrySet &geometry_set) {
#ifdef WITH_OPENVDB
+ geometry_set.modify_geometry_sets([&](GeometrySet &geometry_set) {
initialize_volume_component_from_points(params, geometry_set);
-#endif
});
-
params.set_output("Geometry", std::move(geometry_set));
+#else
+ params.error_message_add(NodeWarningType::Error,
+ TIP_("Disabled, Blender was compiled without OpenVDB"));
+ params.set_output("Geometry", GeometrySet());
+#endif
}
} // namespace blender::nodes
More information about the Bf-blender-cvs
mailing list