[Bf-blender-cvs] [d58631afc87] master: Fix error showing active tool side-bar in the image editor

[Campbell Barton]

Commit: d58631afc8709f5edd498838ae53a6f8aae08f0d
Author: Campbell Barton
Date:   Mon May 20 10:49:42 2019 +1000
Branches: master
https://developer.blender.org/rBd58631afc8709f5edd498838ae53a6f8aae08f0d

Fix error showing active tool side-bar in the image editor

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 4e7b5ea22d8..c0bb50b6597 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -567,11 +567,13 @@ class ToolSelectPanelHelper:
         if space_type is None:
             space_data = context.space_data
             space_type = space_data.type
+        else:
+            space_data = None
 
         if space_type == 'VIEW_3D':
             return space_type, context.mode
         elif space_type == 'IMAGE_EDITOR':
-            if space_type is None:
+            if space_data is None:
                 space_data = context.space_data
             return space_type, space_data.mode
         elif space_type == 'NODE_EDITOR':