[Bf-blender-cvs] [fa708261679] blender2.8: Fix more image editor Python errors after switching workspaces.

[Brecht Van Lommel]

Commit: fa708261679e08ed4f2a099ce0b53989922317a4
Author: Brecht Van Lommel
Date:   Fri Aug 17 13:09:59 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfa708261679e08ed4f2a099ce0b53989922317a4

Fix more image editor Python errors after switching workspaces.

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

M	release/scripts/startup/bl_ui/space_toolsystem_common.py
M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 91ded3e4456..ef6a5d9e60a 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -280,7 +280,10 @@ class ToolSelectPanelHelper:
         elif space_type == 'IMAGE_EDITOR':
             space_data = context.space_data
             if mode is None:
-                mode = space_data.mode
+                if space_data is None:
+                    mode = 'VIEW'
+                else:
+                    mode = space_data.mode
             tool = context.workspace.tools.from_space_image_mode(mode, create)
             if tool is not None:
                 tool.refresh_from_context()
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 6ff02d0ab10..cc2f34e314d 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1395,9 +1395,9 @@ class IMAGE_PT_tools_active(ToolSelectPanelHelper, Panel):
     def tools_from_context(cls, context, mode=None):
         if mode is None:
             if context.space_data is None:
-                mode = context.space_data.mode
-            else:
                 mode = 'VIEW'
+            else:
+                mode = context.space_data.mode
         for tools in (cls._tools[None], cls._tools.get(mode, ())):
             for item in tools:
                 if not (type(item) is ToolDef) and callable(item):