blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: Simplify logic in set material node

This commit is contained in:
Hans Goudey 2021-12-16 15:44:50 -06:00
parent da2c564bb0
commit b7e151d876
Notes: blender-bot 2023-02-13 16:44:40 +01:00 
Referenced by issue #94197, Boolean Apply Clearing custom data layers (bevel weight Weight / Vgroup Data)
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/nodes/geometry/nodes/node_geo_set_material.cc
View File

@ -73,37 +73,29 @@ static void node_geo_exec(GeoNodeExecParams params)
bool volume_selection_warning = false;
geometry_set.modify_geometry_sets([&](GeometrySet &geometry_set) {
if (geometry_set.has<MeshComponent>()) {
if (geometry_set.has_mesh()) {
MeshComponent &mesh_component = geometry_set.get_component_for_write<MeshComponent>();
Mesh *mesh = mesh_component.get_for_write();
if (mesh != nullptr) {
GeometryComponentFieldContext field_context{mesh_component, ATTR_DOMAIN_FACE};
Mesh &mesh = *mesh_component.get_for_write();
GeometryComponentFieldContext field_context{mesh_component, ATTR_DOMAIN_FACE};
fn::FieldEvaluator selection_evaluator{field_context, mesh->totpoly};
selection_evaluator.add(selection_field);
selection_evaluator.evaluate();
const IndexMask selection = selection_evaluator.get_evaluated_as_mask(0);
fn::FieldEvaluator selection_evaluator{field_context, mesh.totpoly};
selection_evaluator.add(selection_field);
selection_evaluator.evaluate();
const IndexMask selection = selection_evaluator.get_evaluated_as_mask(0);
assign_material_to_faces(*mesh, selection, material);
}
assign_material_to_faces(mesh, selection, material);
}
if (geometry_set.has_volume()) {
Volume &volume = *geometry_set.get_volume_for_write();
if (Volume *volume = geometry_set.get_volume_for_write()) {
BKE_id_material_eval_assign(&volume->id, 1, material);
if (selection_field.node().depends_on_input()) {
volume_selection_warning = true;
}
BKE_id_material_eval_assign(&volume.id, 1, material);
}
if (geometry_set.has_pointcloud()) {
PointCloud &pointcloud = *geometry_set.get_pointcloud_for_write();
if (PointCloud *pointcloud = geometry_set.get_pointcloud_for_write()) {
BKE_id_material_eval_assign(&pointcloud->id, 1, material);
if (selection_field.node().depends_on_input()) {
point_selection_warning = true;
}
BKE_id_material_eval_assign(&pointcloud.id, 1, material);
}
});