sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

dict.get() defaults to None as the second arg. no need to supply it.

Browse Source
This commit is contained in:
Campbell Barton 2010-01-04 21:10:51 +00:00
parent 2034a77a45
commit c79cf56b69
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/io/import_scene_obj.py
View File

@ -886,12 +886,12 @@ def create_nurbs(scn, context_nurbs, vert_loc, new_objects):
Add nurbs object to blender, only support one type at the moment Add nurbs object to blender, only support one type at the moment
''' '''
deg = context_nurbs.get('deg', (3,)) deg = context_nurbs.get('deg', (3,))
curv_range = context_nurbs.get('curv_range', None) curv_range = context_nurbs.get('curv_range')
curv_idx = context_nurbs.get('curv_idx', []) curv_idx = context_nurbs.get('curv_idx', [])
parm_u = context_nurbs.get('parm_u', []) parm_u = context_nurbs.get('parm_u', [])
parm_v = context_nurbs.get('parm_v', []) parm_v = context_nurbs.get('parm_v', [])
name = context_nurbs.get('name', 'ObjNurb') name = context_nurbs.get('name', 'ObjNurb')
cstype = context_nurbs.get('cstype', None) cstype = context_nurbs.get('cstype')
if cstype == None: if cstype == None:
print('\tWarning, cstype not found') print('\tWarning, cstype not found')

4
release/scripts/io/netrender/master.py
View File

@ -760,7 +760,7 @@ class RenderMasterServer(http.server.HTTPServer):
self.slaves_map.pop(slave.id) self.slaves_map.pop(slave.id)
def getSlave(self, slave_id): def getSlave(self, slave_id):
return self.slaves_map.get(slave_id, None) return self.slaves_map.get(slave_id)
def getSeenSlave(self, slave_id): def getSeenSlave(self, slave_id):
slave = self.getSlave(slave_id) slave = self.getSlave(slave_id)
@ -842,7 +842,7 @@ class RenderMasterServer(http.server.HTTPServer):
job.save() job.save()
def getJobID(self, id): def getJobID(self, id):
return self.jobs_map.get(id, None) return self.jobs_map.get(id)
def __iter__(self): def __iter__(self):
for job in self.jobs: for job in self.jobs:

2
release/scripts/io/netrender/ui.py
View File

@ -303,7 +303,7 @@ NetRenderSettings.BoolProperty( attr="server_broadcast",
description="broadcast server address on local network", description="broadcast server address on local network",
default = True) default = True)
default_path = os.environ.get("TEMP", None) default_path = os.environ.get("TEMP")
if not default_path: if not default_path:
if os.name == 'nt': if os.name == 'nt':

8
release/scripts/modules/rigify_utils.py
View File

@ -129,7 +129,7 @@ def blend_bone_list(obj, apply_bones, from_bones, to_bones, target_bone=None, ta
target_bone = apply_bones[-1] # default to the last bone target_bone = apply_bones[-1] # default to the last bone
prop_pbone = obj.pose.bones[target_bone] prop_pbone = obj.pose.bones[target_bone]
if prop_pbone.get(target_bone, None) is None: if prop_pbone.get(target_bone) is None:
prop = rna_idprop_ui_prop_get(prop_pbone, target_prop, create=True) prop = rna_idprop_ui_prop_get(prop_pbone, target_prop, create=True)
prop_pbone[target_prop] = blend_default prop_pbone[target_prop] = blend_default
prop["soft_min"] = 0.0 prop["soft_min"] = 0.0
@ -402,9 +402,9 @@ def _bone_class_instance_update(self):
for member in self.attr_names: for member in self.attr_names:
name = getattr(self, member, None) name = getattr(self, member, None)
if name is not None: if name is not None:
setattr(self, member + "_b", bbones.get(name, None)) setattr(self, member + "_b", bbones.get(name))
setattr(self, member + "_p", pbones.get(name, None)) setattr(self, member + "_p", pbones.get(name))
setattr(self, member + "_e", ebones.get(name, None)) setattr(self, member + "_e", ebones.get(name))
def _bone_class_instance_rename(self, attr, new_name): def _bone_class_instance_rename(self, attr, new_name):