archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2018-02-15 12:33:44 +01:00
parent 9d2a699a90 6d4022f619
commit 2589f55a55
16 changed files with 345 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
release/scripts/startup/bl_ui/properties_particle.py
View File

@@ -1197,6 +1197,12 @@ class PARTICLE_PT_children(ParticleButtonsPanel, Panel):
col.label(text="Effects:")
sub = col.column(align=True)
if part.child_type == 'SIMPLE':
sub.prop(part, "twist")
sub.prop(part, "use_twist_curve")
if part.use_twist_curve:
sub.template_curve_mapping(part, "twist_curve")
sub.prop(part, "use_clump_curve")
if part.use_clump_curve:
sub.template_curve_mapping(part, "clump_curve")
@@ -1384,6 +1390,10 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel):
row.prop_search(psys, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End")
row.prop(psys, "invert_vertex_group_roughness_end", text="", toggle=True, icon='ARROW_LEFTRIGHT')
row = col.row(align=True)
row.prop_search(psys, "vertex_group_twist", ob, "vertex_groups", text="Twist")
row.prop(psys, "invert_vertex_group_twist", text="", toggle=True, icon='ARROW_LEFTRIGHT')
# Commented out vertex groups don't work and are still waiting for better implementation
# row = layout.row()
# row.prop_search(psys, "vertex_group_velocity", ob, "vertex_groups", text="Velocity")