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

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Sean Kim
2024-10-18 11:21:38 -07:00
parent 784739499e c2073095c9
commit 34d8535a4e
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@@ -1975,7 +1975,6 @@ class _defs_texture_paint:
idname="builtin.brush",
label="Paint",
icon="brush.sculpt.paint",
cursor='PAINT_CROSS',
options={'USE_BRUSHES'},
)

2
source/blender/editors/geometry/node_group_operator.cc
View File

@@ -488,7 +488,7 @@ static int run_node_group_exec(bContext *C, wmOperator *op)
for (ID *id : input_ids.values()) {
/* Skip IDs that are already fully evaluated in the active depsgraph. */
if (!DEG_id_is_fully_evaluated(depsgraph_active, id)) {
return extra_ids.add(id);
extra_ids.add(id);
}
}

6
source/blender/editors/sculpt_paint/sculpt.cc
View File

@@ -872,7 +872,7 @@ static void restore_mask_from_undo_step(Object &object)
nodes[i]))
{
const Span<int> verts = nodes[i].verts();
array_utils::scatter(*orig_data, verts, mask.span);
scatter_data_mesh(*orig_data, verts, mask.span);
bke::pbvh::node_update_mask_mesh(mask.span, nodes[i]);
node_changed[i] = true;
}
@@ -1050,13 +1050,13 @@ void restore_position_from_undo_step(const Depsgraph &depsgraph, Object &object)
undo_positions, verts, positions_eval, tls.translations);
}
array_utils::scatter(undo_positions, verts, positions_eval);
scatter_data_mesh(undo_positions, verts, positions_eval);
if (positions_eval.data() != positions_orig.data()) {
/* When the evaluated positions and original mesh positions don't point to the same
* array, they must both be updated. */
if (ss.deform_imats.is_empty()) {
array_utils::scatter(undo_positions, verts, positions_orig);
scatter_data_mesh(undo_positions, verts, positions_orig);
}
else {
/* Because brush deformation is calculated for the evaluated deformed positions,

8
source/blender/editors/sculpt_paint/sculpt_face_set.cc
View File

@@ -314,7 +314,7 @@ static void face_sets_update(const Depsgraph &depsgraph,
}
undo::push_node(depsgraph, object, &nodes[i], undo::Type::FaceSet);
array_utils::scatter(new_face_sets.as_span(), faces, face_sets.span);
scatter_data_mesh(new_face_sets.as_span(), faces, face_sets.span);
node_changed[i] = true;
});
}
@@ -334,7 +334,7 @@ static void face_sets_update(const Depsgraph &depsgraph,
}
undo::push_node(depsgraph, object, &nodes[i], undo::Type::FaceSet);
array_utils::scatter(new_face_sets.as_span(), faces, face_sets.span);
scatter_data_mesh(new_face_sets.as_span(), faces, face_sets.span);
node_changed[i] = true;
});
}
@@ -896,7 +896,7 @@ static void face_hide_update(const Depsgraph &depsgraph,
}
undo::push_node(depsgraph, object, &nodes[i], undo::Type::HideFace);
array_utils::scatter(new_hide.as_span(), faces, hide_poly.span);
scatter_data_mesh(new_hide.as_span(), faces, hide_poly.span);
node_changed[i] = true;
});
}
@@ -916,7 +916,7 @@ static void face_hide_update(const Depsgraph &depsgraph,
}
undo::push_node(depsgraph, object, &nodes[i], undo::Type::HideFace);
array_utils::scatter(new_hide.as_span(), faces, hide_poly.span);
scatter_data_mesh(new_hide.as_span(), faces, hide_poly.span);
node_changed[i] = true;
});
}