[Bf-blender-cvs] [873794b196a] master: Fix T103937: Applying modifier resets shape keys

Hans Goudey noreply at git.blender.org
Tue Jan 17 17:23:05 CET 2023


Commit: 873794b196a2f346d5f78ab3f1a60008cf544545
Author: Hans Goudey
Date:   Tue Jan 17 10:20:16 2023 -0600
Branches: master
https://developer.blender.org/rB873794b196a2f346d5f78ab3f1a60008cf544545

Fix T103937: Applying modifier resets shape keys

The order of arguments to memcpy was reversed, which is sadly possible
because the constness `KeyBlock` of keyblock doesn't propagate to
pointers it contains.

===================================================================

M	source/blender/blenkernel/intern/key.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index 57d040c5c4f..7d835c2464d 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -2218,7 +2218,7 @@ void BKE_keyblock_convert_to_mesh(const KeyBlock *kb,
                                   const int totvert)
 {
   const int tot = min_ii(kb->totelem, totvert);
-  memcpy(kb->data, vert_positions, sizeof(float[3]) * tot);
+  memcpy(vert_positions, kb->data, sizeof(float[3]) * tot);
 }
 
 void BKE_keyblock_mesh_calc_normals(const KeyBlock *kb,



More information about the Bf-blender-cvs mailing list