[Bf-extensions-cvs] [3683429d] master: BlenderKit: reorder UI unregistration handlers don't complain about properties which have already been removed.

[Vilem Duha]

Commit: 3683429de050b8026835d17ae7288a436c31cdb6
Author: Vilem Duha
Date:   Thu Apr 4 07:51:48 2019 +0200
Branches: master
https://developer.blender.org/rBA3683429de050b8026835d17ae7288a436c31cdb6

BlenderKit: reorder UI unregistration
handlers don't complain about properties which have already been removed.

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

M	blenderkit/__init__.py
M	blenderkit/ui.py

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

diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index e66d5e96..ea76bc13 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -1385,8 +1385,17 @@ def register():
 
 
 def unregister():
-    for cls in classes:
-        bpy.utils.unregister_class(cls)
+
+    ui.unregister_ui()
+    search.unregister_search()
+    asset_inspector.unregister_asset_inspector()
+    download.unregister_download()
+    upload.unregister_upload()
+    ratings.unregister_ratings()
+    autothumb.unregister_thumbnailer()
+    ui_panels.unregister_ui_panels()
+    bg_blender.unregister()
+    overrides.unregister_overrides()
 
     del bpy.types.Scene.blenderkit_models
     del bpy.types.Scene.blenderkit_scene
@@ -1398,13 +1407,5 @@ def unregister():
     del bpy.types.Material.blenderkit
     del bpy.types.Brush.blenderkit
 
-    search.unregister_search()
-    asset_inspector.unregister_asset_inspector()
-    download.unregister_download()
-    upload.unregister_upload()
-    ratings.unregister_ratings()
-    autothumb.unregister_thumbnailer()
-    ui.unregister_ui()
-    ui_panels.unregister_ui_panels()
-    bg_blender.unregister()
-    overrides.unregister_overrides()
+    for cls in classes:
+        bpy.utils.unregister_class(cls)
diff --git a/blenderkit/ui.py b/blenderkit/ui.py
index 7d0a3573..7f974d99 100644
--- a/blenderkit/ui.py
+++ b/blenderkit/ui.py
@@ -1412,13 +1412,14 @@ def register_ui():
 def unregister_ui():
     global handler_2d, handler_3d
 
+    bpy.types.SpaceView3D.draw_handler_remove(handler_2d, 'WINDOW')
+    bpy.types.SpaceView3D.draw_handler_remove(handler_3d, 'WINDOW')
+
     for c in classess:
         bpy.utils.unregister_class(c)
 
     args = (None, bpy.context)
 
-    bpy.types.SpaceView3D.draw_handler_remove(handler_2d, 'WINDOW')
-    bpy.types.SpaceView3D.draw_handler_remove(handler_3d, 'WINDOW')
 
     wm = bpy.context.window_manager
     if not wm.keyconfigs.addon: