[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31183] trunk/blender: poll() as a python '@staticmethod' was too limiting and didnt allow useful base class poll functions in many cases .
Campbell Barton
ideasman42 at gmail.com
Mon Aug 9 03:37:10 CEST 2010
Revision: 31183
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31183
Author: campbellbarton
Date: 2010-08-09 03:37:09 +0200 (Mon, 09 Aug 2010)
Log Message:
-----------
poll() as a python '@staticmethod' was too limiting and didnt allow useful base class poll functions in many cases.
now rna functions that dont have a 'self' are automatically assumed '@classmethods'.
de-duplicated poll functions and made some minor tweaks too.
Modified Paths:
--------------
trunk/blender/release/scripts/io/export_3ds.py
trunk/blender/release/scripts/io/export_fbx.py
trunk/blender/release/scripts/io/export_mdd.py
trunk/blender/release/scripts/io/export_ply.py
trunk/blender/release/scripts/io/import_shape_mdd.py
trunk/blender/release/scripts/io/netrender/operators.py
trunk/blender/release/scripts/io/netrender/ui.py
trunk/blender/release/scripts/modules/rna_prop_ui.py
trunk/blender/release/scripts/op/fcurve_euler_filter.py
trunk/blender/release/scripts/op/mesh.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/object_align.py
trunk/blender/release/scripts/op/sequencer.py
trunk/blender/release/scripts/op/uv.py
trunk/blender/release/scripts/op/uvcalc_follow_active.py
trunk/blender/release/scripts/op/uvcalc_smart_project.py
trunk/blender/release/scripts/templates/operator.py
trunk/blender/release/scripts/templates/operator_simple.py
trunk/blender/release/scripts/templates/operator_uv.py
trunk/blender/release/scripts/ui/properties_data_armature.py
trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
trunk/blender/release/scripts/ui/properties_data_bone.py
trunk/blender/release/scripts/ui/properties_data_camera.py
trunk/blender/release/scripts/ui/properties_data_curve.py
trunk/blender/release/scripts/ui/properties_data_empty.py
trunk/blender/release/scripts/ui/properties_data_lamp.py
trunk/blender/release/scripts/ui/properties_data_lattice.py
trunk/blender/release/scripts/ui/properties_data_mesh.py
trunk/blender/release/scripts/ui/properties_data_metaball.py
trunk/blender/release/scripts/ui/properties_data_modifier.py
trunk/blender/release/scripts/ui/properties_game.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/release/scripts/ui/properties_object.py
trunk/blender/release/scripts/ui/properties_object_constraint.py
trunk/blender/release/scripts/ui/properties_particle.py
trunk/blender/release/scripts/ui/properties_physics_cloth.py
trunk/blender/release/scripts/ui/properties_physics_field.py
trunk/blender/release/scripts/ui/properties_physics_fluid.py
trunk/blender/release/scripts/ui/properties_physics_smoke.py
trunk/blender/release/scripts/ui/properties_physics_softbody.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/properties_texture.py
trunk/blender/release/scripts/ui/properties_world.py
trunk/blender/release/scripts/ui/space_console.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_logic.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_text.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_userpref_keymap.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/release/scripts/io/export_3ds.py
===================================================================
--- trunk/blender/release/scripts/io/export_3ds.py 2010-08-09 01:20:13 UTC (rev 31182)
+++ trunk/blender/release/scripts/io/export_3ds.py 2010-08-09 01:37:09 UTC (rev 31183)
@@ -1133,8 +1133,8 @@
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
- @staticmethod
- def poll(context): # Poll isnt working yet
+ @classmethod
+ def poll(cls, context): # Poll isnt working yet
return context.active_object != None
# Add to a menu
Modified: trunk/blender/release/scripts/io/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/io/export_fbx.py 2010-08-09 01:20:13 UTC (rev 31182)
+++ trunk/blender/release/scripts/io/export_fbx.py 2010-08-09 01:37:09 UTC (rev 31183)
@@ -3361,8 +3361,8 @@
BATCH_FILE_PREFIX = StringProperty(name="Prefix", description="Prefix each file with this name", maxlen=1024, default="")
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return context.active_object
def execute(self, context):
Modified: trunk/blender/release/scripts/io/export_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/export_mdd.py 2010-08-09 01:20:13 UTC (rev 31182)
+++ trunk/blender/release/scripts/io/export_mdd.py 2010-08-09 01:37:09 UTC (rev 31183)
@@ -165,8 +165,8 @@
frame_start = IntProperty(name="Start Frame", description="Start frame for baking", min=minframe, max=maxframe, default=1)
frame_end = IntProperty(name="End Frame", description="End frame for baking", min=minframe, max=maxframe, default=250)
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
ob = context.active_object
return (ob and ob.type == 'MESH')
Modified: trunk/blender/release/scripts/io/export_ply.py
===================================================================
--- trunk/blender/release/scripts/io/export_ply.py 2010-08-09 01:20:13 UTC (rev 31182)
+++ trunk/blender/release/scripts/io/export_ply.py 2010-08-09 01:37:09 UTC (rev 31183)
@@ -275,8 +275,8 @@
use_uvs = BoolProperty(name="UVs", description="Exort the active UV layer", default=True)
use_colors = BoolProperty(name="Vertex Colors", description="Exort the active vertex color layer", default=True)
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return context.active_object != None
def execute(self, context):
Modified: trunk/blender/release/scripts/io/import_shape_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/import_shape_mdd.py 2010-08-09 01:20:13 UTC (rev 31182)
+++ trunk/blender/release/scripts/io/import_shape_mdd.py 2010-08-09 01:37:09 UTC (rev 31183)
@@ -120,8 +120,8 @@
#fps = IntProperty(name="Frames Per Second", description="Number of frames/second", min=minfps, max=maxfps, default=25)
frame_start = IntProperty(name="Start Frame", description="Start frame for inserting animation", min=minframe, max=maxframe, default=0)
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
ob = context.active_object
return (ob and ob.type == 'MESH')
Modified: trunk/blender/release/scripts/io/netrender/operators.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/operators.py 2010-08-09 01:20:13 UTC (rev 31182)
+++ trunk/blender/release/scripts/io/netrender/operators.py 2010-08-09 01:37:09 UTC (rev 31183)
@@ -31,8 +31,8 @@
bl_idname = "render.netslavebake"
bl_label = "Bake all in file"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -89,8 +89,8 @@
bl_idname = "render.netclientanim"
bl_label = "Animation on network"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -116,8 +116,8 @@
bl_idname = "render.netclientstart"
bl_label = "Start Service"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -133,8 +133,8 @@
bl_idname = "render.netclientsend"
bl_label = "Send job"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -163,8 +163,8 @@
bl_idname = "render.netclientsendframe"
bl_label = "Send current frame job"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -193,8 +193,8 @@
bl_idname = "render.netclientstatus"
bl_label = "Client Status"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -233,8 +233,8 @@
bl_idname = "render.netclientblacklistslave"
bl_label = "Client Blacklist Slave"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -263,8 +263,8 @@
bl_idname = "render.netclientwhitelistslave"
bl_label = "Client Whitelist Slave"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -294,8 +294,8 @@
bl_idname = "render.netclientslaves"
bl_label = "Client Slaves"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -339,8 +339,8 @@
bl_idname = "render.netclientcancel"
bl_label = "Client Cancel"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
netsettings = context.scene.network_render
return netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0
@@ -368,8 +368,8 @@
bl_idname = "render.netclientcancelall"
bl_label = "Client Cancel All"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -395,8 +395,8 @@
bl_idname = "render.netclientdownload"
bl_label = "Client Download"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
netsettings = context.scene.network_render
return netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0
@@ -440,8 +440,8 @@
bl_idname = "render.netclientscan"
bl_label = "Client Scan"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -463,8 +463,8 @@
bl_idname = "render.netclientweb"
bl_label = "Open Master Monitor"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
netsettings = context.scene.network_render
return netsettings.server_address != "[default]"
Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py 2010-08-09 01:20:13 UTC (rev 31182)
+++ trunk/blender/release/scripts/io/netrender/ui.py 2010-08-09 01:37:09 UTC (rev 31183)
@@ -93,9 +93,9 @@
bl_label = "Network Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
- return base_poll(__class__, context)
+ @classmethod
+ def poll(cls, context):
+ return base_poll(cls, context)
def draw(self, context):
layout = self.layout
@@ -131,10 +131,10 @@
bl_label = "Slave Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
scene = context.scene
- return base_poll(__class__, context) and scene.network_render.mode == "RENDER_SLAVE"
+ return base_poll(cls, context) and scene.network_render.mode == "RENDER_SLAVE"
def draw(self, context):
layout = self.layout
@@ -156,10 +156,10 @@
bl_label = "Master Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
scene = context.scene
- return base_poll(__class__, context) and scene.network_render.mode == "RENDER_MASTER"
+ return base_poll(cls, context) and scene.network_render.mode == "RENDER_MASTER"
def draw(self, context):
layout = self.layout
@@ -174,10 +174,10 @@
bl_label = "Job Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
scene = context.scene
- return base_poll(__class__, context) and scene.network_render.mode == "RENDER_CLIENT"
+ return base_poll(cls, context) and scene.network_render.mode == "RENDER_CLIENT"
def draw(self, context):
layout = self.layout
@@ -214,14 +214,14 @@
bl_label = "Slaves Status"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
scene = context.scene
netsettings = scene.network_render
if netsettings.mode != "RENDER_CLIENT":
return False
verify_address(netsettings)
- return base_poll(__class__, context) and netsettings.server_address != "[default]"
+ return base_poll(cls, context) and netsettings.server_address != "[default]"
def draw(self, context):
layout = self.layout
@@ -252,14 +252,14 @@
bl_label = "Slaves Blacklist"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
scene = context.scene
netsettings = scene.network_render
if netsettings.mode != "RENDER_CLIENT":
return False
verify_address(netsettings)
- return base_poll(__class__, context) and netsettings.server_address != "[default]"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list