From feb9cb18936d312e552183353ed7e4494f2bfa38 Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Sat, 2 Apr 2011 15:00:58 +0000 Subject: Revert 1732. The problem was the break in register call order. This was not the right fix at all. --- netrender/__init__.py | 4 ---- netrender/ui.py | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'netrender') diff --git a/netrender/__init__.py b/netrender/__init__.py index 682fac51..5ae4b774 100644 --- a/netrender/__init__.py +++ b/netrender/__init__.py @@ -71,11 +71,7 @@ def register(): import bpy bpy.utils.register_module(__name__) - from bpy.props import PointerProperty - scene = bpy.context.scene - bpy.types.Scene.network_render = PointerProperty(type=ui.NetRenderSettings, name="Network Render", description="Network Render Settings") - if scene: ui.init_data(scene.network_render) diff --git a/netrender/ui.py b/netrender/ui.py index 06ee231d..f6eb94f5 100644 --- a/netrender/ui.py +++ b/netrender/ui.py @@ -539,6 +539,8 @@ class NetRenderSettings(bpy.types.PropertyGroup): NetRenderSettings.slaves = CollectionProperty(type=NetRenderSlave, name="Slaves", description="") NetRenderSettings.slaves_blacklist = CollectionProperty(type=NetRenderSlave, name="Slaves Blacklist", description="") NetRenderSettings.jobs = CollectionProperty(type=NetRenderJob, name="Job List", description="") + + bpy.types.Scene.network_render = PointerProperty(type=NetRenderSettings, name="Network Render", description="Network Render Settings") @classmethod def unregister(cls): -- cgit v1.2.3