[Bf-blender-cvs] [26b0de42515] temp-workspace-object-mode-removal: Clear scene obedit when switching view layers

Campbell Barton noreply at git.blender.org
Wed Feb 7 13:26:08 CET 2018


Commit: 26b0de42515d51967566bac85986a777af056941
Author: Campbell Barton
Date:   Wed Feb 7 23:25:47 2018 +1100
Branches: temp-workspace-object-mode-removal
https://developer.blender.org/rB26b0de42515d51967566bac85986a777af056941

Clear scene obedit when switching view layers

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

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 7b3b2f0e94a..e165f4fc3ad 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -776,6 +776,9 @@ static void rna_Window_view_layer_set(PointerRNA *ptr, PointerRNA value)
 	WorkSpace *workspace = WM_window_get_active_workspace(win);
 
 	BKE_workspace_view_layer_set(workspace, value.data, scene);
+
+	/* note: we probably remove this, for now clear to avoid confusion. */
+	scene->obedit = NULL;
 }
 
 static PointerRNA rna_KeyMapItem_properties_get(PointerRNA *ptr)



More information about the Bf-blender-cvs mailing list