[Bf-blender-cvs] [b91185d6af1] temp-object-multi-mode: Correct assert adding new object

Campbell Barton noreply at git.blender.org
Tue Mar 13 13:45:51 CET 2018


Commit: b91185d6af184207080f3cc75e3ed30d342fd2b0
Author: Campbell Barton
Date:   Tue Mar 13 20:22:36 2018 +1100
Branches: temp-object-multi-mode
https://developer.blender.org/rBb91185d6af184207080f3cc75e3ed30d342fd2b0

Correct assert adding new object

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

M	source/blender/editors/object/object_edit.c

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

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 08a5b4ad651..31b63973745 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -443,7 +443,7 @@ void ED_object_editmode_enter(bContext *C, int flag)
 	if (ob == NULL) return;
 	if (ID_IS_LINKED(ob)) return;
 
-	ED_object_editmode_enter_ex(workspace, scene, ob, flag);
+	ED_object_editmode_enter_ex(workspace, scene, ob, flag & ~EM_DO_UNDO);
 	if (flag & EM_DO_UNDO) ED_undo_push(C, "Enter Editmode");
 }



More information about the Bf-blender-cvs mailing list