archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed reloading after upgrading from 1.4.4.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2017-05-03 12:12:58 +02:00
parent 543da5c8d8
commit ff8e71c542
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,6 +1,11 @@
# Blender Cloud changelog # Blender Cloud changelog
## Version 1.6.4 (in development)
- Fixed reloading after upgrading from 1.4.4 (our last public release).
## Version 1.6.4 (2017-04-21) ## Version 1.6.4 (2017-04-21)
- Added file exclusion filter for Flamenco. A filter like "*.abc;*.mkv;*.mov" can be - Added file exclusion filter for Flamenco. A filter like "*.abc;*.mkv;*.mov" can be

23
blender_cloud/__init__.py
View File

@ -65,21 +65,28 @@ def register():
def reload_mod(name): def reload_mod(name):
modname = '%s.%s' % (__name__, name) modname = '%s.%s' % (__name__, name)
module = importlib.reload(sys.modules[modname]) try:
sys.modules[modname] = module old_module = sys.modules[modname]
return module except KeyError:
# Wasn't loaded before -- can happen after an upgrade.
new_module = importlib.import_module(modname)
else:
new_module = importlib.reload(old_module)
sys.modules[modname] = new_module
return new_module
reload_mod('blendfile') reload_mod('blendfile')
reload_mod('home_project') reload_mod('home_project')
reload_mod('utils') reload_mod('utils')
blender = reload_mod('blender')
async_loop = reload_mod('async_loop') async_loop = reload_mod('async_loop')
flamenco = reload_mod('flamenco')
attract = reload_mod('attract')
texture_browser = reload_mod('texture_browser') texture_browser = reload_mod('texture_browser')
settings_sync = reload_mod('settings_sync') settings_sync = reload_mod('settings_sync')
image_sharing = reload_mod('image_sharing') image_sharing = reload_mod('image_sharing')
attract = reload_mod('attract') blender = reload_mod('blender')
flamenco = reload_mod('flamenco')
else: else:
from . import (blender, texture_browser, async_loop, settings_sync, blendfile, home_project, from . import (blender, texture_browser, async_loop, settings_sync, blendfile, home_project,
image_sharing, attract, flamenco) image_sharing, attract, flamenco)
@ -88,11 +95,11 @@ def register():
async_loop.register() async_loop.register()
flamenco.register() flamenco.register()
attract.register()
texture_browser.register() texture_browser.register()
blender.register()
settings_sync.register() settings_sync.register()
image_sharing.register() image_sharing.register()
attract.register() blender.register()
blender.handle_project_update() blender.handle_project_update()