griefith/test2
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:
Germano Cavalcante
2024-11-11 13:35:57 -03:00
parent 90ed91dfdb fe37ede725
commit d7ac528d53
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/pbvh.cc
View File

@@ -2410,6 +2410,10 @@ static Span<float3> vert_positions_eval(const Object &object_orig, const Object
return mesh_eval->vert_positions();
}
}
if (!ss.deform_cos.is_empty()) {
BLI_assert(ss.deform_cos.size() == mesh_orig.verts_num);
return ss.deform_cos;
}
if (const Mesh *mesh_eval = BKE_object_get_mesh_deform_eval(&object_eval)) {
return mesh_eval->vert_positions();
}
@@ -2434,6 +2438,10 @@ static MutableSpan<float3> vert_positions_eval_for_write(Object &object_orig, Ob
return mesh_eval_mut->vert_positions_for_write();
}
}
if (!ss.deform_cos.is_empty()) {
BLI_assert(ss.deform_cos.size() == mesh_orig.verts_num);
return ss.deform_cos;
}
if (const Mesh *mesh_eval = BKE_object_get_mesh_deform_eval(&object_eval)) {
Mesh *mesh_eval_mut = const_cast<Mesh *>(mesh_eval);
return mesh_eval_mut->vert_positions_for_write();

2
source/blender/editors/space_view3d/view3d_cursor_snap.cc
View File

@@ -622,7 +622,7 @@ static void v3d_cursor_snap_update(V3DSnapCursorState *state,
snap_data->is_snap_invert = v3d_cursor_is_snap_invert(data_intern, event_modifier);
#endif
if (snap_data->is_snap_invert != (tool_settings->snap_flag & SCE_SNAP) == 0) {
if (snap_data->is_snap_invert != ((tool_settings->snap_flag & SCE_SNAP) == 0) {
snap_data->is_enabled = false;
if (!calc_plane_omat) {
snap_data->type_target = SCE_SNAP_TO_NONE;