[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31071] trunk/blender: bugfix [#23182] Using self.report() inside poll() gives crash
Campbell Barton
ideasman42 at gmail.com
Thu Aug 5 18:05:30 CEST 2010
Revision: 31071
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31071
Author: campbellbarton
Date: 2010-08-05 18:05:30 +0200 (Thu, 05 Aug 2010)
Log Message:
-----------
bugfix [#23182] Using self.report() inside poll() gives crash
poll() function is now a static method in python, this is more correct, matching C where the operator is not created to run poll.
def poll(self, context): ...
is now...
@staticmethod
def poll(context): ...
Pythons way of doing static methods is a bit odd but cant be helped :|
This does make subclassing poll functions with COMPAT_ENGINES break, so had to modify quite a few scripts for this.
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/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_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/makesrna/intern/rna_ui.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
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-05 15:50:36 UTC (rev 31070)
+++ trunk/blender/release/scripts/io/export_3ds.py 2010-08-05 16:05:30 UTC (rev 31071)
@@ -1135,7 +1135,8 @@
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
- def poll(self, context): # Poll isnt working yet
+ @staticmethod
+ def poll(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-05 15:50:36 UTC (rev 31070)
+++ trunk/blender/release/scripts/io/export_fbx.py 2010-08-05 16:05:30 UTC (rev 31071)
@@ -3361,7 +3361,8 @@
BATCH_FILE_PREFIX = StringProperty(name="Prefix", description="Prefix each file with this name", maxlen=1024, default="")
- def poll(self, context):
+ @staticmethod
+ def poll(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-05 15:50:36 UTC (rev 31070)
+++ trunk/blender/release/scripts/io/export_mdd.py 2010-08-05 16:05:30 UTC (rev 31071)
@@ -165,7 +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)
- def poll(self, context):
+ @staticmethod
+ def poll(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-05 15:50:36 UTC (rev 31070)
+++ trunk/blender/release/scripts/io/export_ply.py 2010-08-05 16:05:30 UTC (rev 31071)
@@ -275,7 +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)
- def poll(self, context):
+ @staticmethod
+ def poll(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-05 15:50:36 UTC (rev 31070)
+++ trunk/blender/release/scripts/io/import_shape_mdd.py 2010-08-05 16:05:30 UTC (rev 31071)
@@ -120,7 +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)
- def poll(self, context):
+ @staticmethod
+ def poll(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-05 15:50:36 UTC (rev 31070)
+++ trunk/blender/release/scripts/io/netrender/operators.py 2010-08-05 16:05:30 UTC (rev 31071)
@@ -31,7 +31,8 @@
bl_idname = "render.netslavebake"
bl_label = "Bake all in file"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -88,7 +89,8 @@
bl_idname = "render.netclientanim"
bl_label = "Animation on network"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -114,7 +116,8 @@
bl_idname = "render.netclientstart"
bl_label = "Start Service"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -130,7 +133,8 @@
bl_idname = "render.netclientsend"
bl_label = "Send job"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -159,7 +163,8 @@
bl_idname = "render.netclientsendframe"
bl_label = "Send current frame job"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -188,7 +193,8 @@
bl_idname = "render.netclientstatus"
bl_label = "Client Status"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -227,7 +233,8 @@
bl_idname = "render.netclientblacklistslave"
bl_label = "Client Blacklist Slave"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -256,7 +263,8 @@
bl_idname = "render.netclientwhitelistslave"
bl_label = "Client Whitelist Slave"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -286,7 +294,8 @@
bl_idname = "render.netclientslaves"
bl_label = "Client Slaves"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -330,7 +339,8 @@
bl_idname = "render.netclientcancel"
bl_label = "Client Cancel"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
netsettings = context.scene.network_render
return netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0
@@ -358,7 +368,8 @@
bl_idname = "render.netclientcancelall"
bl_label = "Client Cancel All"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -384,7 +395,8 @@
bl_idname = "render.netclientdownload"
bl_label = "Client Download"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
netsettings = context.scene.network_render
return netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0
@@ -428,7 +440,8 @@
bl_idname = "render.netclientscan"
bl_label = "Client Scan"
- def poll(self, context):
+ @staticmethod
+ def poll(context):
return True
def execute(self, context):
@@ -450,7 +463,8 @@
bl_idname = "render.netclientweb"
bl_label = "Open Master Monitor"
- def poll(self, context):
+ @staticmethod
+ def poll(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-05 15:50:36 UTC (rev 31070)
+++ trunk/blender/release/scripts/io/netrender/ui.py 2010-08-05 16:05:30 UTC (rev 31071)
@@ -82,15 +82,17 @@
bl_context = "render"
# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
- def poll(self, context):
- rd = context.scene.render
- return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES)
# Setting panel, use in the scene for now.
class RENDER_PT_network_settings(bpy.types.Panel, RenderButtonsPanel):
bl_label = "Network Settings"
COMPAT_ENGINES = {'NET_RENDER'}
+ @staticmethod
+ def poll(context):
+ rd = context.scene.render
+ return (rd.use_game_engine==False) and (rd.engine in __class__.COMPAT_ENGINES)
+
def draw(self, context):
layout = self.layout
@@ -125,10 +127,13 @@
bl_label = "Slave Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- def poll(self, context):
+ @staticmethod
+ def poll(context):
scene = context.scene
- return (super().poll(context)
- and scene.network_render.mode == "RENDER_SLAVE")
+ ### return (super().poll(context)
+ ### and scene.network_render.mode == "RENDER_SLAVE")
+ ### FIXME ^^^
+ return scene.network_render.mode == "RENDER_SLAVE"
def draw(self, context):
layout = self.layout
@@ -150,10 +155,13 @@
bl_label = "Master Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- def poll(self, context):
+ @staticmethod
+ def poll(context):
scene = context.scene
- return (super().poll(context)
- and scene.network_render.mode == "RENDER_MASTER")
+ ### return (super().poll(context)
+ ### and scene.network_render.mode == "RENDER_MASTER")
+ ### ^^^ FIXME
+ return scene.network_render.mode == "RENDER_MASTER"
def draw(self, context):
layout = self.layout
@@ -168,10 +176,13 @@
bl_label = "Job Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- def poll(self, context):
+ @staticmethod
+ def poll(context):
scene = context.scene
- return (super().poll(context)
- and scene.network_render.mode == "RENDER_CLIENT")
+ ### return (super().poll(context)
+ ### and scene.network_render.mode == "RENDER_CLIENT")
+ ### ^^^ FIXME
+ return scene.network_render.mode == "RENDER_CLIENT"
def draw(self, context):
layout = self.layout
@@ -208,14 +219,17 @@
bl_label = "Slaves Status"
COMPAT_ENGINES = {'NET_RENDER'}
- def poll(self, context):
+ @staticmethod
+ def poll(context):
scene = context.scene
netsettings = scene.network_render
if netsettings.mode != "RENDER_CLIENT":
return False
verify_address(netsettings)
- return (super().poll(context)
- and netsettings.server_address != "[default]")
+ ### return (super().poll(context)
+ ### and netsettings.server_address != "[default]")
+ ### ^^^ FIXME
+ return netsettings.server_address != "[default]"
def draw(self, context):
layout = self.layout
@@ -246,14 +260,16 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list