BlenderKit: reorder UI unregistration

handlers don't complain about properties which have already been removed.
This commit is contained in:
Vilem Duha 2019-04-04 07:51:48 +02:00
parent 179b642a4b
commit 3683429de0
2 changed files with 16 additions and 14 deletions

View File

@ -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)

View File

@ -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: