Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge with trunk r39216

Browse Source
This commit is contained in:
Xiao Xiangquan
2011-08-10 14:32:03 +00:00
parent 16deef9e79 22694c993a
commit 465c3b82fa
210 changed files with 6222 additions and 3313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_operators/wm.py
View File

@@ -587,7 +587,7 @@ class WM_OT_context_modal_mouse(bpy.types.Operator):
self._values_clear()
return {'FINISHED'}
elif event_type in ('RIGHTMOUSE', 'ESC'):
elif event_type in {'RIGHTMOUSE', 'ESC'}:
self._values_restore()
return {'FINISHED'}
@@ -841,7 +841,7 @@ class WM_OT_properties_edit(bpy.types.Operator):
prop_ui = rna_idprop_ui_prop_get(item, prop)
if prop_type in (float, int):
if prop_type in {float, int}:
prop_ui['soft_min'] = prop_ui['min'] = prop_type(self.min)
prop_ui['soft_max'] = prop_ui['max'] = prop_type(self.max)