Work around RuntimeError unregistering the texture browser operator.

This commit is contained in:
Sybren A. Stüvel 2016-06-28 16:41:31 +02:00
parent d457c77b19
commit 6eab5ba0af
2 changed files with 6 additions and 9 deletions

View File

@ -81,8 +81,8 @@ def register():
async_loop.setup_asyncio_executor() async_loop.setup_asyncio_executor()
async_loop.register() async_loop.register()
blender.register()
gui.register() gui.register()
blender.register()
settings_sync.register() settings_sync.register()
@ -106,7 +106,7 @@ def _monkey_patch_requests():
def unregister(): def unregister():
from . import blender, gui, async_loop, settings_sync from . import blender, gui, async_loop, settings_sync
gui.unregister()
blender.unregister()
async_loop.unregister()
settings_sync.unregister() settings_sync.unregister()
blender.unregister()
gui.unregister()
async_loop.unregister()

View File

@ -742,13 +742,10 @@ def register():
def unregister(): def unregister():
bpy.utils.unregister_class(BlenderCloudBrowser)
# handle the keymap # handle the keymap
for km, kmi in addon_keymaps: for km, kmi in addon_keymaps:
km.keymap_items.remove(kmi) km.keymap_items.remove(kmi)
addon_keymaps.clear() addon_keymaps.clear()
if 'bl_rna' in BlenderCloudBrowser.__dict__: # <-- check if we already removed!
if __name__ == "__main__": bpy.utils.unregister_class(BlenderCloudBrowser)
register()