[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24776] trunk/blender/release/scripts/ui: use is rather then == when comparing with singletons (None/False/True), its faster and suggested by pep8
Campbell Barton
ideasman42 at gmail.com
Sun Nov 22 18:41:35 CET 2009
Revision: 24776
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24776
Author: campbellbarton
Date: 2009-11-22 18:41:35 +0100 (Sun, 22 Nov 2009)
Log Message:
-----------
use is rather then == when comparing with singletons (None/False/True), its faster and suggested by pep8
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_data_armature.py
trunk/blender/release/scripts/ui/properties_data_bone.py
trunk/blender/release/scripts/ui/properties_data_mesh.py
trunk/blender/release/scripts/ui/properties_object.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_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/space_sequencer.py
trunk/blender/release/scripts/ui/space_userpref.py
Modified: trunk/blender/release/scripts/ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature.py 2009-11-22 17:35:26 UTC (rev 24775)
+++ trunk/blender/release/scripts/ui/properties_data_armature.py 2009-11-22 17:41:35 UTC (rev 24776)
@@ -127,18 +127,18 @@
row.template_list(pose, "bone_groups", pose, "active_bone_group_index", rows=2)
col = row.column(align=True)
- col.active = (ob.proxy == None)
+ col.active = (ob.proxy is None)
col.itemO("pose.group_add", icon='ICON_ZOOMIN', text="")
col.itemO("pose.group_remove", icon='ICON_ZOOMOUT', text="")
group = pose.active_bone_group
if group:
col = layout.column()
- col.active = (ob.proxy == None)
+ col.active = (ob.proxy is None)
col.itemR(group, "name")
split = layout.split()
- split.active = (ob.proxy == None)
+ split.active = (ob.proxy is None)
col = split.column()
col.itemR(group, "color_set")
@@ -148,7 +148,7 @@
col.template_triColorSet(group, "colors")
row = layout.row(align=True)
- row.active = (ob.proxy == None)
+ row.active = (ob.proxy is None)
row.itemO("pose.group_assign", text="Assign")
row.itemO("pose.group_remove", text="Remove") #row.itemO("pose.bone_group_remove_from", text="Remove")
Modified: trunk/blender/release/scripts/ui/properties_data_bone.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_bone.py 2009-11-22 17:35:26 UTC (rev 24775)
+++ trunk/blender/release/scripts/ui/properties_data_bone.py 2009-11-22 17:41:35 UTC (rev 24776)
@@ -185,7 +185,7 @@
col.item_pointerR(bone, "parent", arm, "edit_bones", text="")
sub = col.column()
- sub.active = bone.parent != None
+ sub.active = (bone.parent is not None)
sub.itemR(bone, "connected")
sub.itemR(bone, "hinge", text="Inherit Rotation")
sub.itemR(bone, "inherit_scale", text="Inherit Scale")
Modified: trunk/blender/release/scripts/ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-11-22 17:35:26 UTC (rev 24775)
+++ trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-11-22 17:41:35 UTC (rev 24776)
@@ -156,7 +156,7 @@
enable_edit = ob.mode != 'EDIT'
enable_edit_value = False
- if ob.shape_key_lock == False:
+ if ob.shape_key_lock is False:
if enable_edit or (ob.type == 'MESH' and ob.shape_key_edit_mode):
enable_edit_value = True
Modified: trunk/blender/release/scripts/ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object.py 2009-11-22 17:35:26 UTC (rev 24775)
+++ trunk/blender/release/scripts/ui/properties_object.py 2009-11-22 17:41:35 UTC (rev 24776)
@@ -135,7 +135,7 @@
parent = ob.parent
if parent and ob.parent_type == 'BONE' and parent.type == 'ARMATURE':
sub.item_pointerR(ob, "parent_bone", parent.data, "bones", text="")
- sub.active = parent != None
+ sub.active = (parent is not None)
class OBJECT_PT_groups(ObjectButtonsPanel):
@@ -276,10 +276,10 @@
row.active = len(ob.particle_systems) != 0
row = col.row()
row.itemR(ob, "time_offset_parent", text="Parent")
- row.active = ob.parent != None
+ row.active = (ob.parent is not None)
row = col.row()
row.itemR(ob, "slow_parent")
- row.active = ob.parent != None
+ row.active = (ob.parent is not None)
col.itemR(ob, "time_offset", text="Offset")
if wide_ui:
@@ -290,7 +290,7 @@
col.itemR(ob, "up_axis", text="Up Axis")
row = col.row()
row.itemR(ob, "track_override_parent", text="Override Parent")
- row.active = ob.parent != None
+ row.active = (ob.parent is not None)
class OBJECT_PT_properties(ObjectButtonsPanel):
Modified: trunk/blender/release/scripts/ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_particle.py 2009-11-22 17:35:26 UTC (rev 24775)
+++ trunk/blender/release/scripts/ui/properties_particle.py 2009-11-22 17:41:35 UTC (rev 24776)
@@ -26,14 +26,14 @@
def particle_panel_enabled(context, psys):
- return psys.point_cache.baked == False and psys.edited == False and (not context.particle_system_editable)
+ return (psys.point_cache.baked is False) and (not psys.edited) and (not context.particle_system_editable)
def particle_panel_poll(context):
psys = context.particle_system
- if psys == None:
+ if psys is None:
return False
- if psys.settings == None:
+ if psys.settings is None:
return False
return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR')
@@ -110,14 +110,14 @@
split = layout.split(percentage=0.65)
if part.type == 'HAIR':
- if psys.edited == True:
+ if psys.edited:
split.itemO("particle.edited_clear", text="Free Edit")
else:
split.itemL(text="")
row = split.row()
row.enabled = particle_panel_enabled(context, psys)
row.itemR(part, "hair_step")
- if psys.edited == True:
+ if psys.edited:
if psys.global_hair:
layout.itemO("particle.connect_hair")
layout.itemL(text="Hair is disconnected.")
@@ -190,9 +190,9 @@
def poll(self, context):
psys = context.particle_system
- if psys == None:
+ if psys is None:
return False
- if psys.settings == None:
+ if psys.settings is None:
return False
return psys.settings.type == 'HAIR'
@@ -240,9 +240,9 @@
def poll(self, context):
psys = context.particle_system
- if psys == None:
+ if psys is None:
return False
- if psys.settings == None:
+ if psys.settings is None:
return False
phystype = psys.settings.physics_type
if phystype == 'NO' or phystype == 'KEYED':
@@ -488,9 +488,9 @@
def poll(self, context):
psys = context.particle_system
- if psys == None:
+ if psys is None:
return False
- if psys.settings == None:
+ if psys.settings is None:
return False
if psys.point_cache.external:
return False
@@ -586,9 +586,9 @@
def poll(self, context):
psys = context.particle_system
- if psys == None:
+ if psys is None:
return False
- if psys.settings == None:
+ if psys.settings is None:
return False
return True
@@ -625,20 +625,20 @@
sub.itemR(part, "velocity_length")
elif part.ren_as == 'PATH':
- if part.type != 'HAIR' and part.physics_type != 'KEYED' and psys.point_cache.baked == False:
+ if part.type != 'HAIR' and part.physics_type != 'KEYED' and (psys.point_cache.baked is False):
box = layout.box()
box.itemL(text="Baked or keyed particles needed for correct rendering.")
return
sub.itemR(part, "render_strand")
subsub = sub.column()
- subsub.active = part.render_strand == False
+ subsub.active = (part.render_strand is False)
subsub.itemR(part, "render_adaptive")
subsub = sub.column()
subsub.active = part.render_adaptive or part.render_strand == True
subsub.itemR(part, "adaptive_angle")
subsub = sub.column()
- subsub.active = part.render_adaptive == True and part.render_strand == False
+ subsub.active = (part.render_adaptive is True and part.render_strand is False)
subsub.itemR(part, "adaptive_pix")
sub.itemR(part, "hair_bspline")
sub.itemR(part, "render_step", text="Steps")
@@ -675,12 +675,12 @@
sub = split.column()
sub.itemR(part, "whole_group")
subsub = sub.column()
- subsub.active = part.whole_group == False
+ subsub.active = (part.whole_group is False)
subsub.itemR(part, "use_group_count")
sub = split.column()
subsub = sub.column()
- subsub.active = part.whole_group == False
+ subsub.active = (part.whole_group is False)
subsub.itemR(part, "use_global_dupli")
subsub.itemR(part, "rand_group")
@@ -754,9 +754,9 @@
def poll(self, context):
psys = context.particle_system
- if psys == None:
+ if psys is None:
return False
- if psys.settings == None:
+ if psys.settings is None:
return False
return True
@@ -774,7 +774,7 @@
path = (part.ren_as == 'PATH' and part.draw_as == 'RENDER') or part.draw_as == 'PATH'
- if path and part.type != 'HAIR' and part.physics_type != 'KEYED' and psys.point_cache.baked == False:
+ if path and part.type != 'HAIR' and part.physics_type != 'KEYED' and psys.point_cache.baked is False:
box = layout.box()
box.itemL(text="Baked or keyed particles needed for correct drawing.")
return
@@ -801,7 +801,7 @@
col.itemR(part, "draw_step")
else:
sub = col.column()
- sub.active = part.material_color == False
+ sub.active = (part.material_color is False)
#sub.itemL(text="color")
#sub.itemL(text="Override material color")
Modified: trunk/blender/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_cloth.py 2009-11-22 17:35:26 UTC (rev 24775)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list