[Bf-blender-cvs] [53d94dafc47] topbar: Fix issues in .py after last merge

[Julian Eisel]

Commit: 53d94dafc474380651fc529f9c03f84ce7142b13
Author: Julian Eisel
Date:   Thu Dec 7 18:02:12 2017 +0100
Branches: topbar
https://developer.blender.org/rB53d94dafc474380651fc529f9c03f84ce7142b13

Fix issues in .py after last merge

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

M	release/scripts/startup/bl_ui/space_topbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 869facf41c2..a778b123cf2 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -97,11 +97,11 @@ class TOPBAR_HT_lower_bar(Header):
 
     def draw_left(self, context):
         layout = self.layout
-        workspace = context.workspace
+        window = context.window
+
+        act_mode_item = bpy.types.Object.bl_rna.properties['mode'].enum_items[window.object_mode]
+        layout.operator_menu_enum("object.mode_set", "mode", text=act_mode_item.name, icon=act_mode_item.icon)
 
-        if hasattr(workspace, 'object_mode'):
-            act_mode_item = bpy.types.Object.bl_rna.properties['mode'].enum_items[workspace.object_mode]
-            layout.operator_menu_enum("object.mode_set", "mode", text=act_mode_item.name, icon=act_mode_item.icon)
 
     def draw_right(self, context):
         layout = self.layout
@@ -115,7 +115,8 @@ class TOPBAR_HT_lower_bar(Header):
             layout.operator("screen.back_to_previous", icon='SCREEN_BACK', text="Back to Previous")
         else:
             layout.template_search_preview(window, "screen", workspace, "screens", new="screen.new", unlink="screen.delete", rows=2, cols=6)
-        layout.template_search(workspace, "view_layer", scene, "view_layers")
+        # Active workspace view-layer is retrieved through window, not through workspace.
+        layout.template_search(window, "view_layer", scene, "view_layers")
 
 
 class TOPBAR_MT_editor_menus(Menu):