diff options
author | Hans Goudey <h.goudey@me.com> | 2021-10-25 21:29:06 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-10-25 21:29:06 +0300 |
commit | 92ad5400267c7950311676b9eaac94e1fbab04ca (patch) | |
tree | eb87e1612a5552ae93e5ceaae488d96ccfa9967b /source/blender | |
parent | 47d0b2f14e818ee8e0116df47421ba0a52596790 (diff) |
Fixes for compiling and starting Blender
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/nodes/NOD_static_types.h | 2 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_mesh_to_level_set.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 6238363af65..48281eda4a2 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -379,6 +379,8 @@ DefNode(GeometryNode, GEO_NODE_LEVEL_SET_PRIMITIVE_SPHERE , 0, "LEVEL_SET_PRIMIT DefNode(GeometryNode, GEO_NODE_LEVEL_SET_PRIMITIVE_PLATONIC , def_geo_level_set_primitive_platonic, "LEVEL_SET_PRIMITIVE_PLATONIC", LevelSetPlatonic, "Level Set Platonic", "") DefNode(GeometryNode, GEO_NODE_LEVEL_SET_TO_FOG_VOLUME , 0, "LEVEL_SET_TO_FOG", LevelSetToFogVolume, "Level Set to Fog Volume", "") DefNode(GeometryNode, GEO_NODE_LEVEL_SET_TO_MASK , 0, "LEVEL_SET_TO_Mask", LevelSetToMask, "Level Set to Mask", "") +DefNode(GeometryNode, GEO_NODE_REPLACE_MATERIAL, 0, "REPLACE_MATERIAL", ReplaceMaterial, "Replace Material", "") +DefNode(GeometryNode, GEO_NODE_MATERIAL_SELECTION, 0, "MATERIAL_SELECTION", MaterialSelection, "Material Selection", "") DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CIRCLE, def_geo_mesh_circle, "MESH_PRIMITIVE_CIRCLE", MeshCircle, "Mesh Circle", "") DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CONE, def_geo_mesh_cone, "MESH_PRIMITIVE_CONE", MeshCone, "Cone", "") DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CUBE, 0, "MESH_PRIMITIVE_CUBE", MeshCube, "Cube", "") diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_level_set.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_level_set.cc index abd5cb49028..85812a90995 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_level_set.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_level_set.cc @@ -135,13 +135,13 @@ static void geo_node_mesh_to_level_set_exec(GeoNodeExecParams params) return; } - GeometrySet geometry_set_out; #ifdef WITH_OPENVDB const float voxel_size = params.get_input<float>("Voxel Size"); Volume *volume = meshes_to_level_set_volume(set_groups, voxel_size); -#endif - params.set_output("Level Set", GeometrySet::create_with_volume(volume)); +#else + params.set_output("Level Set", GeometrySet()); +#endif } } // namespace blender::nodes |