[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36906] trunk/blender/source/blender/ blenkernel/intern/object.c: fix [#27485] Create new shapekey on lattice
Campbell Barton
ideasman42 at gmail.com
Thu May 26 08:34:32 CEST 2011
Revision: 36906
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36906
Author: campbellbarton
Date: 2011-05-26 06:34:31 +0000 (Thu, 26 May 2011)
Log Message:
-----------
fix [#27485] Create new shapekey on lattice
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/object.c
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-05-26 05:40:00 UTC (rev 36905)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-05-26 06:34:31 UTC (rev 36906)
@@ -3037,9 +3037,14 @@
if(newkey || from_mix==FALSE) {
kb= add_keyblock(key, name);
-
- /* create from lattice */
- latt_to_key(lt, kb);
+ if (!newkey) {
+ KeyBlock *basekb= (KeyBlock *)key->block.first;
+ kb->data= MEM_dupallocN(basekb->data);
+ kb->totelem= basekb->totelem;
+ }
+ else {
+ latt_to_key(lt, kb);
+ }
}
else {
/* copy from current values */
@@ -3075,7 +3080,10 @@
KeyBlock *basekb= (KeyBlock *)key->block.first;
kb->data= MEM_dupallocN(basekb->data);
kb->totelem= basekb->totelem;
- } else curve_to_key(cu, kb, lb);
+ }
+ else {
+ curve_to_key(cu, kb, lb);
+ }
}
else {
/* copy from current values */
More information about the Bf-blender-cvs
mailing list