From 1d93bd9e5ee0e989cedb7107519054d9f6acee95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 22 Jun 2017 14:43:37 +0200 Subject: [PATCH] Allow reloading of the Flamenco module with F8 --- blender_cloud/flamenco/__init__.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/blender_cloud/flamenco/__init__.py b/blender_cloud/flamenco/__init__.py index d6c4821..72e096a 100644 --- a/blender_cloud/flamenco/__init__.py +++ b/blender_cloud/flamenco/__init__.py @@ -25,6 +25,19 @@ import logging from pathlib import Path, PurePath import typing + +if "bpy" in locals(): + import importlib + + try: + bam_interface = importlib.reload(bam_interface) + sdk = importlib.reload(sdk) + except NameError: + from . import bam_interface, sdk +else: + from . import bam_interface, sdk + + import bpy from bpy.types import AddonPreferences, Operator, WindowManager, Scene, PropertyGroup from bpy.props import StringProperty, EnumProperty, PointerProperty, BoolProperty, IntProperty @@ -32,6 +45,7 @@ from bpy.props import StringProperty, EnumProperty, PointerProperty, BoolPropert from .. import async_loop, pillar from ..utils import pyside_cache, redraw + log = logging.getLogger(__name__) # Global flag used to determine whether panels etc. can be drawn. @@ -301,7 +315,6 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin, from datetime import datetime from ..blender import preferences - from . import bam_interface prefs = preferences() @@ -359,7 +372,6 @@ class FLAMENCO_OT_copy_files(Operator, async def async_execute(self, context): from pathlib import Path - from . import bam_interface from ..blender import preferences context.window_manager.flamenco_status = 'PACKING'