diff options
Diffstat (limited to 'release/scripts/io/netrender/__init__.py')
| -rw-r--r-- | release/scripts/io/netrender/__init__.py | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/release/scripts/io/netrender/__init__.py b/release/scripts/io/netrender/__init__.py index b8c1fddc691..6c4ed4119fc 100644 --- a/release/scripts/io/netrender/__init__.py +++ b/release/scripts/io/netrender/__init__.py @@ -20,16 +20,18 @@ # To support reload properly, try to access a package var, if it's there, reload everything if "init_data" in locals(): - reload(model) - reload(operators) - reload(client) - reload(slave) - reload(master) - reload(master_html) - reload(utils) - reload(balancing) - reload(ui) - reload(repath) + import imp + imp.reload(model) + imp.reload(operators) + imp.reload(client) + imp.reload(slave) + imp.reload(master) + imp.reload(master_html) + imp.reload(utils) + imp.reload(balancing) + imp.reload(ui) + imp.reload(repath) + imp.reload(versioning) else: from netrender import model from netrender import operators @@ -41,18 +43,25 @@ else: from netrender import balancing from netrender import ui from netrender import repath + from netrender import versioning jobs = [] slaves = [] blacklist = [] init_file = "" -init_address = True +valid_address = False init_data = True def register(): ui.addProperties() + + import bpy + scene = bpy.context.scene + if scene: + netsettings = scene.network_render + ui.init_data(netsettings) def unregister(): |