[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33136] trunk/blender/source/blender/ editors/object/object_edit.c: bugfix [#24685] Changing mode bypasses undo suppression
Campbell Barton
ideasman42 at gmail.com
Wed Nov 17 16:16:49 CET 2010
Revision: 33136
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33136
Author: campbellbarton
Date: 2010-11-17 16:16:49 +0100 (Wed, 17 Nov 2010)
Log Message:
-----------
bugfix [#24685] Changing mode bypasses undo suppression
Editmode undo operator was using the operator OPTYPE_UNDO flag as well as its own EM_DO_UNDO option.
This gave 2 problems.
- python suppressed undos would fail (as in the report).
- Undo push was called twice on exiting editmode for no reason.
Use the operator undo in this case.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_edit.c
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2010-11-17 15:06:00 UTC (rev 33135)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2010-11-17 15:16:49 UTC (rev 33136)
@@ -511,7 +511,7 @@
if(!CTX_data_edit_object(C))
ED_object_enter_editmode(C, EM_WAITCURSOR);
else
- ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR|EM_DO_UNDO);
+ ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls undo too [#24685] */
return OPERATOR_FINISHED;
}
More information about the Bf-blender-cvs
mailing list