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

Fix #126199: Various brushes deform base mesh on non-basis shape key

Browse Source 
When restoring the orig_position values for certain brushes, we need to
apply similar logic and avoid updating the base mesh if we are sculpting
on a non-basis shape key.

Pull Request: https://projects.blender.org/blender/blender/pulls/126305
This commit is contained in:
Sean Kim
2024-08-14 02:53:47 +02:00
committed by Sean Kim
parent 2af62ba0f6
commit 63bc8997a0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1382,8 +1382,8 @@ void restore_position_from_undo_step(Object &object)
Vector<float3> translations;
};
const bool need_translations = !ss.deform_imats.is_empty() ||
BKE_keyblock_from_object(&object);
const KeyBlock *active_key = BKE_keyblock_from_object(&object);
const bool need_translations = !ss.deform_imats.is_empty() || active_key;
threading::EnumerableThreadSpecific<LocalData> all_tls;
threading::parallel_for(nodes.index_range(), 1, [&](const IndexRange range) {
@@ -1410,11 +1410,16 @@ void restore_position_from_undo_step(Object &object)
/* Because brush deformation is calculated for the evaluated deformed positions,
* the translations have to be transformed to the original space. */
apply_crazyspace_to_translations(ss.deform_imats, verts, tls.translations);
apply_translations(tls.translations, verts, positions_orig);
if (active_key == nullptr || mesh.key->refkey == active_key) {
/* We only ever want to propagate changes back to the base mesh if we either have
* no shape key active, or we are working on the basis shape key.
* See #126199 for more information. */
apply_translations(tls.translations, verts, positions_orig);
}
}
}
if (const KeyBlock *active_key = BKE_keyblock_from_object(&object)) {
if (active_key) {
update_shape_keys(
object, mesh, *active_key, verts, tls.translations, positions_orig);
}