archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages 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_ui/properties_particle.py
View File

@@ -463,7 +463,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel):
col.prop(part, "mass")
col.prop(part, "use_multiply_size_mass", text=_("Multiply mass with size"))
if part.physics_type in ('NEWTON', 'FLUID'):
if part.physics_type in {'NEWTON', 'FLUID'}:
split = layout.split()
col = split.column()
@@ -922,7 +922,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel):
col = row.column()
col.label(text="")
if part.render_type in ('OBJECT', 'GROUP') and not part.use_advanced_hair:
if part.render_type in {'OBJECT', 'GROUP'} and not part.use_advanced_hair:
row = layout.row(align=True)
row.prop(part, "particle_size")
row.prop(part, "size_random", slider=True)