[Bf-blender-cvs] [b04997cca45] master: Fix T90547: Add node errors when compiled without OpenVDB or Bullet
Hans Goudey
noreply at git.blender.org
Mon Aug 9 20:42:28 CEST 2021
Commit: b04997cca45882526ff8eb3c65579046e618d9bd
Author: Hans Goudey
Date: Mon Aug 9 13:42:19 2021 -0500
Branches: master
https://developer.blender.org/rBb04997cca45882526ff8eb3c65579046e618d9bd
Fix T90547: Add node errors when compiled without OpenVDB or Bullet
These were added in other places but were overlooked here.
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
M source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
index 91d569282c3..91e08d7777b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
@@ -304,6 +304,8 @@ static void geo_node_convex_hull_exec(GeoNodeExecParams params)
}
params.set_output("Convex Hull", GeometrySet::create_with_mesh(mesh));
#else
+ params.error_message_add(NodeWarningType::Error,
+ TIP_("Disabled, Blender was compiled without Bullet"));
params.set_output("Convex Hull", geometry_set);
#endif /* WITH_BULLET */
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
index 403f4906d07..4c1151bf6c2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
@@ -149,6 +149,9 @@ static void geo_node_volume_to_mesh_exec(GeoNodeExecParams params)
#ifdef WITH_OPENVDB
create_mesh_from_volume(geometry_set_in, geometry_set_out, params);
+#else
+ params.error_message_add(NodeWarningType::Error,
+ TIP_("Disabled, Blender was compiled without OpenVDB"));
#endif
params.set_output("Geometry", geometry_set_out);
More information about the Bf-blender-cvs
mailing list