[Bf-blender-cvs] [572dd65614d] geometry-nodes-level-set-nodes: Only allow float grids in boolean node
Hans Goudey
noreply at git.blender.org
Thu Sep 2 21:44:29 CEST 2021
Commit: 572dd65614da04816d4eb6e31f20b37f22f4b428
Author: Hans Goudey
Date: Thu Sep 2 14:43:04 2021 -0500
Branches: geometry-nodes-level-set-nodes
https://developer.blender.org/rB572dd65614da04816d4eb6e31f20b37f22f4b428
Only allow float grids in boolean node
Should resolve compile warning for bool comparison in one of the VDB headers
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_level_set_boolean.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_level_set_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_level_set_boolean.cc
index 2381ecfabde..910722be4bd 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_level_set_boolean.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_level_set_boolean.cc
@@ -107,7 +107,7 @@ static void level_set_boolean(Volume &volume_a,
bke::volume::to_static_type(grid_type_a, [&](auto dummy) {
using GridType = decltype(dummy);
- if constexpr (std::is_scalar<typename GridType::ValueType>::value) {
+ if constexpr (std::is_same_v<GridType, openvdb::FloatGrid>) {
GridType &grid_a = static_cast<GridType &>(*grid_base_a);
const GridType &grid_b = static_cast<const GridType &>(*grid_base_b);
More information about the Bf-blender-cvs
mailing list