diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 14:33:44 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 14:33:44 +0300 |
commit | 2589f55a55bc9682111ab266bb89d8f08713f374 (patch) | |
tree | 6634689ec50057bc782a2c9430ae1059712b0254 /release/scripts | |
parent | 9d2a699a90d5ce7b976e76f6e1b5c260306b5218 (diff) | |
parent | 6d4022f61980ba46efd391dcfe96dd88a8db8deb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 10 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 4932f3467c5..017c1b40386 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -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") diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 01c36347b56..38a7fff8ed3 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -1173,6 +1173,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel): col = split.column() factor_but(col, "use_map_length", "length_factor", "Length") factor_but(col, "use_map_clump", "clump_factor", "Clump") + factor_but(col, "use_map_twist", "twist_factor", "Twist") col = split.column() factor_but(col, "use_map_kink_amp", "kink_amp_factor", "Kink Amplitude") |