[Bf-blender-cvs] [f242f3e75bb] blender2.8: Fix assert on exit edit-mode

[Campbell Barton]

Commit: f242f3e75bbc4132f36eadf9fe552280a164a7b6
Author: Campbell Barton
Date:   Thu Mar 1 22:36:40 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBf242f3e75bbc4132f36eadf9fe552280a164a7b6

Fix assert on exit edit-mode

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

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 320aadf2249..ec81cdfdf69 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -299,6 +299,8 @@ void ED_object_editmode_exit_ex(bContext *C, WorkSpace 
*workspace, Scene *scene,
 
                /* also flush ob recalc, doesn't take much overhead, but used 
for particles */
                DEG_id_tag_update(&obedit->id, OB_RECALC_OB | OB_RECALC_DATA);
+
+               workspace->object_mode &= ~OB_MODE_EDIT;
        
                if (flag & EM_DO_UNDO)
                        ED_undo_push(C, "Editmode");
@@ -309,8 +311,6 @@ void ED_object_editmode_exit_ex(bContext *C, WorkSpace 
*workspace, Scene *scene,
                else {
                        WM_main_add_notifier(NC_SCENE | ND_MODE | 
NS_MODE_OBJECT, scene);
                }
-
-               workspace->object_mode &= ~OB_MODE_EDIT;
        }
 
        ED_workspace_object_mode_sync_from_object(G.main->wm.first, workspace, 
obedit);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs