[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24398] trunk/blender/release/scripts: pedantic enum string consistancy
Campbell Barton
ideasman42 at gmail.com
Sat Nov 7 23:12:03 CET 2009
Revision: 24398
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24398
Author: campbellbarton
Date: 2009-11-07 23:12:03 +0100 (Sat, 07 Nov 2009)
Log Message:
-----------
pedantic enum string consistancy
Modified Paths:
--------------
trunk/blender/release/scripts/op/vertexpaint_dirt.py
trunk/blender/release/scripts/ui/properties_object_constraint.py
trunk/blender/release/scripts/ui/properties_physics_field.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
Modified: trunk/blender/release/scripts/op/vertexpaint_dirt.py
===================================================================
--- trunk/blender/release/scripts/op/vertexpaint_dirt.py 2009-11-07 22:07:46 UTC (rev 24397)
+++ trunk/blender/release/scripts/op/vertexpaint_dirt.py 2009-11-07 22:12:03 UTC (rev 24398)
@@ -117,7 +117,7 @@
active_col_layer = me.vertex_colors[0].data
if not active_col_layer:
- return("CANCELLED", )
+ return('CANCELLED', )
for i, f in enumerate(me.faces):
if not me.use_paint_mask or f.selected:
Modified: trunk/blender/release/scripts/ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object_constraint.py 2009-11-07 22:07:46 UTC (rev 24397)
+++ trunk/blender/release/scripts/ui/properties_object_constraint.py 2009-11-07 22:12:03 UTC (rev 24398)
@@ -133,7 +133,7 @@
def IK(self, context, layout, con):
if context.object.pose.ik_solver == "ITASC":
layout.itemR(con, "ik_type")
- getattr(self, "IK_" + con.ik_type)(context, layout, con)
+ getattr(self, 'IK_' + con.ik_type)(context, layout, con)
else:
# Legacy IK constraint
self.target_template(layout, con)
@@ -702,7 +702,7 @@
split.itemR(pchan, "ik_stretch", text="Stretch", slider=True)
split.itemL()
- if ob.pose.ik_solver == "ITASC":
+ if ob.pose.ik_solver == 'ITASC':
row = layout.row()
row.itemR(pchan, "ik_rot_control", text="Control Rotation")
row.itemR(pchan, "ik_rot_weight", text="Weight", slider=True)
@@ -723,7 +723,7 @@
if ob and bone:
pchan = ob.pose.pose_channels[bone.name]
- return pchan.has_ik and ob.pose.ik_solver == "ITASC" and ob.pose.ik_param
+ return pchan.has_ik and ob.pose.ik_solver == 'ITASC' and ob.pose.ik_param
return False
@@ -734,7 +734,7 @@
itasc = ob.pose.ik_param
layout.itemR(itasc, "mode", expand=True)
- simulation = itasc.mode == "SIMULATION"
+ simulation = itasc.mode == 'SIMULATION'
if simulation:
layout.itemL(text="Reiteration:")
layout.itemR(itasc, "reiteration", expand=True)
@@ -742,7 +742,7 @@
flow = layout.column_flow()
flow.itemR(itasc, "precision", text="Prec")
flow.itemR(itasc, "num_iter", text="Iter")
- flow.active = not simulation or itasc.reiteration != "NEVER"
+ flow.active = not simulation or itasc.reiteration != 'NEVER'
if simulation:
layout.itemR(itasc, "auto_step")
@@ -757,7 +757,7 @@
if simulation:
layout.itemR(itasc, "feedback")
layout.itemR(itasc, "max_velocity")
- if itasc.solver == "DLS":
+ if itasc.solver == 'DLS':
row = layout.row()
row.itemR(itasc, "dampmax", text="Damp", slider=True)
row.itemR(itasc, "dampeps", text="Eps", slider=True)
Modified: trunk/blender/release/scripts/ui/properties_physics_field.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_field.py 2009-11-07 22:07:46 UTC (rev 24397)
+++ trunk/blender/release/scripts/ui/properties_physics_field.py 2009-11-07 22:12:03 UTC (rev 24398)
@@ -77,7 +77,7 @@
layout.itemS()
layout.itemR(field, "guide_kink_type")
- if (field.guide_kink_type != "NONE"):
+ if (field.guide_kink_type != 'NONE'):
layout.itemR(field, "guide_kink_axis")
flow = layout.column_flow()
Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py 2009-11-07 22:07:46 UTC (rev 24397)
+++ trunk/blender/release/scripts/ui/properties_render.py 2009-11-07 22:12:03 UTC (rev 24398)
@@ -199,7 +199,7 @@
sub.active = rd.render_raytracing
sub.itemL(text="Acceleration structure:")
sub.itemR(rd, "raytrace_structure", text="")
- if rd.raytrace_structure == "OCTREE":
+ if rd.raytrace_structure == 'OCTREE':
sub.itemR(rd, "octree_resolution", text="Resolution")
else:
sub.itemR(rd, "use_instances", text="Instances")
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2009-11-07 22:07:46 UTC (rev 24397)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2009-11-07 22:12:03 UTC (rev 24398)
@@ -1224,16 +1224,16 @@
row = subcol.row()
if kmi.expanded:
- row.itemR(kmi, "expanded", text="", icon="ICON_TRIA_DOWN")
+ row.itemR(kmi, "expanded", text="", icon='ICON_TRIA_DOWN')
else:
- row.itemR(kmi, "expanded", text="", icon="ICON_TRIA_RIGHT")
+ row.itemR(kmi, "expanded", text="", icon='ICON_TRIA_RIGHT')
itemrow = row.row()
itemrow.enabled = km.user_defined
if kmi.active:
- itemrow.itemR(kmi, "active", text="", icon="ICON_CHECKBOX_HLT")
+ itemrow.itemR(kmi, "active", text="", icon='ICON_CHECKBOX_HLT')
else:
- itemrow.itemR(kmi, "active", text="", icon="ICON_CHECKBOX_DEHLT")
+ itemrow.itemR(kmi, "active", text="", icon='ICON_CHECKBOX_DEHLT')
itemcol = itemrow.column()
itemcol.active = kmi.active
@@ -1290,11 +1290,11 @@
itemcol.itemS()
- itemrow.itemO("wm.keyitem_remove", text="", icon="ICON_ZOOMOUT")
+ itemrow.itemO("wm.keyitem_remove", text="", icon='ICON_ZOOMOUT')
itemrow = col.row()
itemrow.itemL()
- itemrow.itemO("wm.keyitem_add", text="", icon="ICON_ZOOMIN")
+ itemrow.itemO("wm.keyitem_add", text="", icon='ICON_ZOOMIN')
itemrow.enabled = km.user_defined
bpy.types.register(USERPREF_HT_header)
@@ -1439,7 +1439,7 @@
def execute(self, context):
wm = context.manager
km = wm.active_keymap
- kmi = km.add_item("", "A", "PRESS")
+ kmi = km.add_item("", 'A', 'PRESS')
return ('FINISHED',)
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2009-11-07 22:07:46 UTC (rev 24397)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2009-11-07 22:12:03 UTC (rev 24398)
@@ -1592,13 +1592,13 @@
col.itemR(toolsettings, "etch_convert_mode")
- if toolsettings.etch_convert_mode == "LENGTH":
+ if toolsettings.etch_convert_mode == 'LENGTH':
col.itemR(toolsettings, "etch_length_limit")
- elif toolsettings.etch_convert_mode == "ADAPTIVE":
+ elif toolsettings.etch_convert_mode == 'ADAPTIVE':
col.itemR(toolsettings, "etch_adaptive_limit")
- elif toolsettings.etch_convert_mode == "FIXED":
+ elif toolsettings.etch_convert_mode == 'FIXED':
col.itemR(toolsettings, "etch_subdivision_number")
- elif toolsettings.etch_convert_mode == "RETARGET":
+ elif toolsettings.etch_convert_mode == 'RETARGET':
col.itemR(toolsettings, "etch_template")
col.itemR(toolsettings, "etch_roll_mode")
col.itemR(toolsettings, "etch_autoname")
More information about the Bf-blender-cvs
mailing list