griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: extract function to show missing openvdb error message

Browse Source
This commit is contained in:
Jacques Lucke
2023-12-20 15:58:56 +01:00
parent a72e7a220d
commit 59c84ee95b
7 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/nodes/geometry/node_geometry_util.cc
View File

@@ -93,6 +93,13 @@ const EnumPropertyItem *domain_without_corner_experimental_grease_pencil_version
} // namespace enums
void node_geo_exec_with_missing_openvdb(GeoNodeExecParams &params)
{
params.set_default_remaining_outputs();
params.error_message_add(NodeWarningType::Error,
TIP_("Disabled, Blender was compiled without OpenVDB"));
}
} // namespace blender::nodes
bool geo_node_poll_default(const bNodeType * /*ntype*/,

2
source/blender/nodes/geometry/node_geometry_util.hh
View File

@@ -157,4 +157,6 @@ const EnumPropertyItem *domain_without_corner_experimental_grease_pencil_version
} // namespace enums
void node_geo_exec_with_missing_openvdb(GeoNodeExecParams &params);
} // namespace blender::nodes

4
source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc
View File

@@ -260,9 +260,7 @@ static void node_geo_exec(GeoNodeExecParams params)
params.set_output("Points", std::move(geometry_set));
#else
params.set_default_remaining_outputs();
params.error_message_add(NodeWarningType::Error,
TIP_("Disabled, Blender was compiled without OpenVDB"));
node_geo_exec_with_missing_openvdb(params);
#endif
}

4
source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc
View File

@@ -140,9 +140,7 @@ static void node_geo_exec(GeoNodeExecParams params)
});
params.set_output("Volume", std::move(geometry_set));
#else
params.set_default_remaining_outputs();
params.error_message_add(NodeWarningType::Error,
TIP_("Disabled, Blender was compiled without OpenVDB"));
node_geo_exec_with_missing_openvdb(params);
return;
#endif
}

4
source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
View File

@@ -209,9 +209,7 @@ static void node_geo_exec(GeoNodeExecParams params)
});
params.set_output("Volume", std::move(geometry_set));
#else
params.set_default_remaining_outputs();
params.error_message_add(NodeWarningType::Error,
TIP_("Disabled, Blender was compiled without OpenVDB"));
node_geo_exec_with_missing_openvdb(params);
#endif
}

4
source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc
View File

@@ -177,9 +177,7 @@ static void node_geo_exec(GeoNodeExecParams params)
r_geometry_set.replace_volume(volume);
params.set_output("Volume", r_geometry_set);
#else
params.set_default_remaining_outputs();
params.error_message_add(NodeWarningType::Error,
TIP_("Disabled, Blender was compiled without OpenVDB"));
node_geo_exec_with_missing_openvdb(params);
#endif
}

4
source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
View File

@@ -214,9 +214,7 @@ static void node_geo_exec(GeoNodeExecParams params)
});
params.set_output("Mesh", std::move(geometry_set));
#else
params.set_default_remaining_outputs();
params.error_message_add(NodeWarningType::Error,
TIP_("Disabled, Blender was compiled without OpenVDB"));
node_geo_exec_with_missing_openvdb(params);
#endif
}