[Bf-blender-cvs] [3cc4070a30e] blender2.8: Fix T54179: Assert changing layers in 2nd window

[Campbell Barton]

Commit: 3cc4070a30ea2f4eb9de4b4679a29e6aa9807dbb
Author: Campbell Barton
Date:   Wed Feb 28 00:07:36 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB3cc4070a30ea2f4eb9de4b4679a29e6aa9807dbb

Fix T54179: Assert changing layers in 2nd window

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

M       source/blender/makesrna/intern/rna_wm.c

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

diff --git a/source/blender/makesrna/intern/rna_wm.c 
b/source/blender/makesrna/intern/rna_wm.c
index dca4fa3822d..e827a099f5b 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -785,11 +785,10 @@ static void rna_Window_view_layer_update(struct bContext 
*C, PointerRNA *ptr)
        Scene *scene = WM_window_get_active_scene(win);
        WorkSpace *workspace = WM_window_get_active_workspace(win);
        ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace, scene);
-       Object *obedit = CTX_data_edit_object(C);
-
+       Object *obact = OBACT(view_layer);
        eObjectMode object_mode = workspace->object_mode;
-       if (obedit) {
-               ED_object_editmode_exit(C, EM_FREEDATA);
+       if (obact && (object_mode & OB_MODE_EDIT)) {
+               ED_object_editmode_exit_ex(NULL, workspace, scene, obact, 
EM_FREEDATA);
        }
        workspace->object_mode = object_mode;
        ED_object_base_activate(C, view_layer->basact);

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