Renamed gui.py to texture_browser.py

Also discovered double-unregister of a class, so that fixed an old bug.
Removed the workaround for that bug.
This commit is contained in:
Sybren A. Stüvel 2016-07-15 14:27:42 +02:00
parent 388a059400
commit 9a0873eea4
3 changed files with 7 additions and 10 deletions

View File

@ -74,18 +74,18 @@ def register():
reload_mod('home_project')
blender = reload_mod('blender')
gui = reload_mod('gui')
async_loop = reload_mod('async_loop')
texture_browser = reload_mod('texture_browser')
settings_sync = reload_mod('settings_sync')
image_sharing = reload_mod('image_sharing')
else:
from . import (blender, gui, async_loop, settings_sync, blendfile, home_project,
from . import (blender, texture_browser, async_loop, settings_sync, blendfile, home_project,
image_sharing)
async_loop.setup_asyncio_executor()
async_loop.register()
gui.register()
texture_browser.register()
blender.register()
settings_sync.register()
image_sharing.register()
@ -109,10 +109,10 @@ def _monkey_patch_requests():
def unregister():
from . import blender, gui, async_loop, settings_sync, image_sharing
from . import blender, texture_browser, async_loop, settings_sync, image_sharing
image_sharing.unregister()
settings_sync.unregister()
blender.unregister()
gui.unregister()
texture_browser.unregister()
async_loop.unregister()

View File

@ -10,7 +10,7 @@ import bpy
from bpy.types import AddonPreferences, Operator, WindowManager, Scene, PropertyGroup
from bpy.props import StringProperty, EnumProperty, PointerProperty, BoolProperty
from . import pillar, gui
from . import pillar
PILLAR_SERVER_URL = 'https://cloudapi.blender.org/'
# PILLAR_SERVER_URL = 'http://localhost:5000/'
@ -354,8 +354,6 @@ def register():
def unregister():
unload_custom_icons()
gui.unregister()
bpy.utils.unregister_class(PillarCredentialsUpdate)
bpy.utils.unregister_class(BlenderCloudPreferences)
bpy.utils.unregister_class(SyncStatusProperties)

View File

@ -747,5 +747,4 @@ def unregister():
km.keymap_items.remove(kmi)
addon_keymaps.clear()
if 'bl_rna' in BlenderCloudBrowser.__dict__: # <-- check if we already removed!
bpy.utils.unregister_class(BlenderCloudBrowser)