remove class methods for defining properties

 eg: bpy.types.Scene.BoolProperty()

3 files changed, 34 insertions, 54 deletions

diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py
index c2d943f63f8..7a784af01ea 100644
--- a/release/scripts/io/netrender/ui.py
+++ b/release/scripts/io/netrender/ui.py
@@ -339,42 +339,43 @@ class NetRenderJob(bpy.types.IDPropertyGroup):
     pass
 
 def addProperties():
-    bpy.types.Scene.PointerProperty(attr="network_render", type=NetRenderSettings, name="Network Render", description="Network Render Settings")
+    from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty
+    bpy.types.Scene.network_render = PointerProperty(type=NetRenderSettings, name="Network Render", description="Network Render Settings")
     
-    NetRenderSettings.StringProperty( attr="server_address",
+    NetRenderSettings.server_address = StringProperty(
                     name="Server address",
                     description="IP or name of the master render server",
                     maxlen = 128,
                     default = "[default]")
     
-    NetRenderSettings.IntProperty( attr="server_port",
+    NetRenderSettings.server_port = IntProperty(
                     name="Server port",
                     description="port of the master render server",
                     default = 8000,
                     min=1,
                     max=65535)
     
-    NetRenderSettings.BoolProperty( attr="use_master_broadcast",
+    NetRenderSettings.use_master_broadcast = BoolProperty(
                     name="Broadcast",
                     description="broadcast master server address on local network",
                     default = True)
     
-    NetRenderSettings.BoolProperty( attr="use_slave_clear",
+    NetRenderSettings.use_slave_clear = BoolProperty(
                     name="Clear on exit",
                     description="delete downloaded files on exit",
                     default = True)
     
-    NetRenderSettings.BoolProperty( attr="use_slave_thumb",
+    NetRenderSettings.use_slave_thumb = BoolProperty(
                     name="Generate thumbnails",
                     description="Generate thumbnails on slaves instead of master",
                     default = False)
     
-    NetRenderSettings.BoolProperty( attr="use_slave_output_log",
+    NetRenderSettings.use_slave_output_log = BoolProperty(
                     name="Output render log on console",
                     description="Output render text log to console as well as sending it to the master",
                     default = True)
     
-    NetRenderSettings.BoolProperty( attr="use_master_clear",
+    NetRenderSettings.use_master_clear = BoolProperty(
                     name="Clear on exit",
                     description="delete saved files on exit",
                     default = False)
@@ -389,67 +390,67 @@ def addProperties():
     elif not default_path.endswith(os.sep):
         default_path += os.sep
     
-    NetRenderSettings.StringProperty( attr="path",
+    NetRenderSettings.path = StringProperty(
                     name="Path",
                     description="Path for temporary files",
                     maxlen = 128,
                     default = default_path,
                     subtype='FILE_PATH')
     
-    NetRenderSettings.StringProperty( attr="job_name",
+    NetRenderSettings.job_name = StringProperty(
                     name="Job name",
                     description="Name of the job",
                     maxlen = 128,
                     default = "[default]")
     
-    NetRenderSettings.StringProperty( attr="job_category",
+    NetRenderSettings.job_category = StringProperty(
                     name="Job category",
                     description="Category of the job",
                     maxlen = 128,
                     default = "")
     
-    NetRenderSettings.IntProperty( attr="chunks",
+    NetRenderSettings.chunks = IntProperty(
                     name="Chunks",
                     description="Number of frame to dispatch to each slave in one chunk",
                     default = 5,
                     min=1,
                     max=65535)
     
-    NetRenderSettings.IntProperty( attr="priority",
+    NetRenderSettings.priority = IntProperty(
                     name="Priority",
                     description="Priority of the job",
                     default = 1,
                     min=1,
                     max=10)
     
-    NetRenderSettings.StringProperty( attr="job_id",
+    NetRenderSettings.job_id = StringProperty(
                     name="Network job id",
                     description="id of the last sent render job",
                     maxlen = 64,
                     default = "")
     
-    NetRenderSettings.IntProperty( attr="active_slave_index",
+    NetRenderSettings.active_slave_index = IntProperty(
                     name="Index of the active slave",
                     description="",
                     default = -1,
                     min= -1,
                     max=65535)
     
-    NetRenderSettings.IntProperty( attr="active_blacklisted_slave_index",
+    NetRenderSettings.active_blacklisted_slave_index = IntProperty(
                     name="Index of the active slave",
                     description="",
                     default = -1,
                     min= -1,
                     max=65535)
     
-    NetRenderSettings.IntProperty( attr="active_job_index",
+    NetRenderSettings.active_job_index = IntProperty(
                     name="Index of the active job",
                     description="",
                     default = -1,
                     min= -1,
                     max=65535)
     
-    NetRenderSettings.EnumProperty(attr="mode",
+    NetRenderSettings.mode = EnumProperty(
                             items=(
                                             ("RENDER_CLIENT", "Client", "Act as render client"),
                                             ("RENDER_MASTER", "Master", "Act as render master"),
@@ -459,17 +460,17 @@ def addProperties():
                             description="Mode of operation of this instance",
                             default="RENDER_CLIENT")
     
-    NetRenderSettings.CollectionProperty(attr="slaves", type=NetRenderSlave, name="Slaves", description="")
-    NetRenderSettings.CollectionProperty(attr="slaves_blacklist", type=NetRenderSlave, name="Slaves Blacklist", description="")
-    NetRenderSettings.CollectionProperty(attr="jobs", type=NetRenderJob, name="Job List", description="")
+    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="")
     
-    NetRenderSlave.StringProperty( attr="name",
+    NetRenderSlave.name = StringProperty(
                     name="Name of the slave",
                     description="",
                     maxlen = 64,
                     default = "")
     
-    NetRenderJob.StringProperty( attr="name",
+    NetRenderJob.name = StringProperty(
                     name="Name of the job",
                     description="",
                     maxlen = 128,
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index 9219f7edcb0..b349fa0a76e 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -27,8 +27,8 @@ class RNA_IDProp_Meta(type):
     # bpy.types.Scene.myprop = bpy.props.BoolProperty()
     def __setattr__(cls, attr, value):
         if type(value) == tuple and len(value) == 2:
-            print(cls, attr, value)
-            if attr in cls.bl_rna.properties:
+            prop = cls.bl_rna.properties.get(attr)
+            if prop and prop.is_runtime:
                 _bpy.props.RemoveProperty(cls, attr=attr)
             func, kw = value
             kw["attr"] = attr
diff --git a/release/scripts/ui/properties_data_armature_rigify.py b/release/scripts/ui/properties_data_armature_rigify.py
index afcf0b336ed..92b9074892b 100644
--- a/release/scripts/ui/properties_data_armature_rigify.py
+++ b/release/scripts/ui/properties_data_armature_rigify.py
@@ -18,14 +18,17 @@
 
 # <pep8 compliant>
 import bpy
+from bpy.props import *
 
 
-class PoseTemplateSettings(bpy.types.IDPropertyGroup):
-    pass
+class PoseTemplate(bpy.types.IDPropertyGroup):
+    name = StringProperty(attr="name", name="Name of the slave", description="", maxlen=64, default="")
+    active_template_index = IntProperty(name="Index of the active slave", description="", default=-1, min=-1, max=65535) 
+    use_generate_deform_rig = BoolProperty(name="Create Deform Rig", description="Create a copy of the metarig, constrainted by the generated rig", default=False)
 
 
-class PoseTemplate(bpy.types.IDPropertyGroup):
-    pass
+class PoseTemplateSettings(bpy.types.IDPropertyGroup):
+    templates = CollectionProperty(type=PoseTemplate, name="Templates", description="")
 
 
 def metarig_templates():
@@ -104,10 +107,6 @@ class DATA_PT_template(bpy.types.Panel):
             sub.operator("pose.metarig_reload", icon="FILE_REFRESH", text="")
 
 
-# operators
-from bpy.props import StringProperty
-
-
 class Reload(bpy.types.Operator):
     '''Re-Scan the metarig package directory for scripts'''
 
@@ -314,27 +313,7 @@ import space_info  # ensure the menu is loaded first
 
 
 def register():
-    PoseTemplate.StringProperty(attr="name",
-                    name="Name of the slave",
-                    description="",
-                    maxlen=64,
-                    default="")
-
-    PoseTemplateSettings.CollectionProperty(attr="templates", type=PoseTemplate, name="Templates", description="")
-    PoseTemplateSettings.IntProperty(attr="active_template_index",
-                    name="Index of the active slave",
-                    description="",
-                    default=-1,
-                    min=-1,
-                    max=65535)
-
-    PoseTemplateSettings.BoolProperty(attr="use_generate_deform_rig",
-                    name="Create Deform Rig",
-                    description="Create a copy of the metarig, constrainted by the generated rig",
-                    default=False)
-
-    bpy.types.Scene.PointerProperty(attr="pose_templates", type=PoseTemplateSettings, name="Pose Templates", description="Pose Template Settings")
-
+    bpy.types.Scene.pose_templates = PointerProperty(type=PoseTemplateSettings, name="Pose Templates", description="Pose Template Settings")
     space_info.INFO_MT_armature_add.append(menu_func)