[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43452] branches/bmesh/blender/source/ blender/editors/curve/editcurve.c: fix [#29913] Bezier edit mode crashes on undo.

Campbell Barton ideasman42 at gmail.com
Tue Jan 17 15:21:29 CET 2012


Revision: 43452
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43452
Author:   campbellbarton
Date:     2012-01-17 14:21:27 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
fix [#29913] Bezier edit mode crashes on undo.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/curve/editcurve.c

Modified: branches/bmesh/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/curve/editcurve.c	2012-01-17 13:35:26 UTC (rev 43451)
+++ branches/bmesh/blender/source/blender/editors/curve/editcurve.c	2012-01-17 14:21:27 UTC (rev 43452)
@@ -6857,10 +6857,9 @@
 	return NULL;
 }
 
-static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *obe)
+static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *cu_v)
 {
-	Object *obedit= obe;
-	Curve *cu= (Curve*)obedit->data;
+	Curve *cu= cu_v;
 	UndoCurve *undoCurve= ucu;
 	ListBase *undobase= &undoCurve->nubase;
 	ListBase *editbase= curve_editnurbs(cu);
@@ -6903,13 +6902,15 @@
 
 	cu->lastsel= lastsel;
 	cu->actnu= undoCurve->actnu;
-
+	/* BMESH_TODO */
+#if 0
 	ED_curve_updateAnimPaths(obedit);
+#endif
 }
 
-static void *editCurve_to_undoCurve(void *UNUSED(edata), void *obdata)
+static void *editCurve_to_undoCurve(void *UNUSED(edata), void *cu_v)
 {
-	Curve *cu= obdata;
+	Curve *cu= cu_v;
 	ListBase *nubase= curve_editnurbs(cu);
 	UndoCurve *undoCurve;
 	EditNurb *editnurb= cu->editnurb, tmpEditnurb;



More information about the Bf-blender-cvs mailing list