Revision: 56060
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56060
Author: nazgul
Date: 2013-04-15 12:04:55 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
Fix #34972: Blender crashes when Force Field-> Curve Guide is created
Made it so where_on_path works correct when Curve does
have editNurbs but no Curve->nurbs.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/anim.c
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-15
11:29:31 UTC (rev 56059)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-15
12:04:55 UTC (rev 56060)
@@ -626,6 +626,7 @@
float fac;
float data[4];
int cycl = 0, s0, s1, s2, s3;
+ ListBase *nurbs;
if (ob == NULL || ob->type != OB_CURVE) return 0;
cu = ob->data;
@@ -668,9 +669,12 @@
/* make compatible with vectoquat */
negate_v3(dir);
//}
-
- nu = cu->nurb.first;
+ nurbs = BKE_curve_editNurbs_get(cu);
+ if (!nurbs)
+ nurbs = &cu->nurb;
+ nu = nurbs->first;
+
/* make sure that first and last frame are included in the vectors here
*/
if (nu->type == CU_POLY) key_curve_position_weights(1.0f - fac, data,
KEY_LINEAR);
else if (nu->type == CU_BEZIER) key_curve_position_weights(1.0f - fac,
data, KEY_LINEAR);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
