[Bf-blender-cvs] [77447f0] input_method_editor: Fix T42639, editcurve flags not getting restored on undo.

Antony Riakiotakis noreply at git.blender.org
Mon Nov 24 00:45:08 CET 2014


Commit: 77447f0401f09eacf267daf987e6835313076e5e
Author: Antony Riakiotakis
Date:   Thu Nov 20 18:58:24 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB77447f0401f09eacf267daf987e6835313076e5e

Fix T42639, editcurve flags not getting restored on undo.

Error here could be reproduced by tweaking curve properties such as
2d-3d or fill type and undoing.

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

M	source/blender/editors/curve/editcurve.c

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

diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index d1208b8..99c64be 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -85,6 +85,7 @@ typedef struct {
 	GHash *undoIndex;
 	ListBase fcurves, drivers;
 	int actnu;
+	int flag;
 } UndoCurve;
 
 /* Definitions needed for shape keys */
@@ -6880,6 +6881,7 @@ static void undoCurve_to_editCurve(void *ucu, void *UNUSED(edata), void *cu_v)
 
 	cu->actvert = undoCurve->actvert;
 	cu->actnu = undoCurve->actnu;
+	cu->flag = undoCurve->flag;
 	ED_curve_updateAnimPaths(cu);
 }
 
@@ -6919,6 +6921,7 @@ static void *editCurve_to_undoCurve(void *UNUSED(edata), void *cu_v)
 
 	undoCurve->actvert = cu->actvert;
 	undoCurve->actnu = cu->actnu;
+	undoCurve->flag = cu->flag;
 
 	return undoCurve;
 }




More information about the Bf-blender-cvs mailing list