[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24297] trunk/blender/source/blender: Fix #19742: shape key crashes for curve & lattice.

Brecht Van Lommel brecht at blender.org
Wed Nov 4 10:20:32 CET 2009


Revision: 24297
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24297
Author:   blendix
Date:     2009-11-04 10:20:31 +0100 (Wed, 04 Nov 2009)

Log Message:
-----------
Fix #19742: shape key crashes for curve & lattice.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/curve.c
    trunk/blender/source/blender/editors/object/object_shapekey.c

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2009-11-04 08:59:01 UTC (rev 24296)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2009-11-04 09:20:31 UTC (rev 24297)
@@ -2906,7 +2906,7 @@
 
 float (*curve_getKeyVertexCos(Curve *cu, ListBase *lb, float *key))[3]
 {
-	int i, numVerts;
+	int i, numVerts = count_curveverts(lb);
 	float *co, (*cos)[3] = MEM_mallocN(sizeof(*cos)*numVerts, "cu_vcos");
 	Nurb *nu;
 

Modified: trunk/blender/source/blender/editors/object/object_shapekey.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_shapekey.c	2009-11-04 08:59:01 UTC (rev 24296)
+++ trunk/blender/source/blender/editors/object/object_shapekey.c	2009-11-04 09:20:31 UTC (rev 24297)
@@ -238,6 +238,7 @@
 	if(key==NULL) {
 		key= lt->key= add_key( (ID *)lt);
 		key->type= KEY_RELATIVE;
+		newkey= 1;
 	}
 
 	kb= add_keyblock(scene, key);





More information about the Bf-blender-cvs mailing list