[Bf-extensions-cvs] [67124fb3] master: sun_position T52117 bugfix: on unregister Sun.SP could be None

[Stephen Leger]

Commit: 67124fb3fe7151fe285b28cdf98bbc0cda9c0171
Author: Stephen Leger
Date:   Wed Jul 19 14:53:32 2017 +0200
Branches: master
https://developer.blender.org/rBAC67124fb3fe7151fe285b28cdf98bbc0cda9c0171

sun_position T52117 bugfix: on unregister Sun.SP could be None

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

M	sun_position/hdr.py
M	sun_position/map.py
M	sun_position/north.py
M	sun_position/operators.py

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

diff --git a/sun_position/hdr.py b/sun_position/hdr.py
index 731cf551..f497d259 100644
--- a/sun_position/hdr.py
+++ b/sun_position/hdr.py
@@ -222,8 +222,9 @@ class HdrClass:
         self.glImage = None
         self.image.bindcode = 0
         self.isActive = False
-        Sun.SP.ShowHdr = False
-        Sun.SP.BindToSun = True
+        if Sun.SP:
+            Sun.SP.ShowHdr = False
+            Sun.SP.BindToSun = True
         Sun.BindToSun = False
         Display.refresh()
 
diff --git a/sun_position/map.py b/sun_position/map.py
index cef7ac30..129b3c3c 100644
--- a/sun_position/map.py
+++ b/sun_position/map.py
@@ -239,7 +239,8 @@ class MapClass:
         self.glImage = None
         self.image.bindcode = 0
         self.isActive = False
-        Sun.SP.ShowMap = False
+        if Sun.SP:
+            Sun.SP.ShowMap = False
 
     def load_blender_image(self, file_name):
         if file_name == "None":
diff --git a/sun_position/north.py b/sun_position/north.py
index 836ba9b5..1075a81b 100644
--- a/sun_position/north.py
+++ b/sun_position/north.py
@@ -31,8 +31,8 @@ class NorthClass:
             self.handler = None
         self.isActive = False
         self.refresh_screen()
-
-        Sun.SP.ShowNorth = False
+        if Sun.SP:
+            Sun.SP.ShowNorth = False
         Sun.ShowNorth = False
 
 
diff --git a/sun_position/operators.py b/sun_position/operators.py
index 48a0e64d..600c4bd1 100644
--- a/sun_position/operators.py
+++ b/sun_position/operators.py
@@ -158,8 +158,11 @@ class SunPos_OT_Controller(bpy.types.Operator):
         Stop_all_handlers()
         Controller.remove_handler()
         Display.setAction('ENABLE')
-        Sun.SP.IsActive = False
-
+        try:
+            Sun.SP.IsActive = False
+        except:
+            pass
+            
     def modal(self, context, event):
 
         if Display.PANEL:
@@ -269,14 +272,16 @@ def Cleanup_callback(self, context):
 
 def Cleanup_objects():
     try:
-        Sun.SP.UseObjectGroup = False
+        if Sun.SP:
+            Sun.SP.UseObjectGroup = False
         Sun.UseObjectGroup = False
     except:
         pass
     del Sun.Selected_objects[:]
     del Sun.Selected_names[:]
     Display.setAction('ENABLE')
-    Sun.SP.IsActive = False
+    if Sun.SP:
+        Sun.SP.IsActive = False
 
 
 def Stop_all_handlers():