[Bf-blender-cvs] [8f1951f555f] master: UI Particles: Move message about parting inside Parting panel.

Pablo Vazquez noreply at git.blender.org
Thu May 9 01:54:12 CEST 2019


Commit: 8f1951f555f56c4db64905918911773ee19c2b3f
Author: Pablo Vazquez
Date:   Thu May 9 01:54:00 2019 +0200
Branches: master
https://developer.blender.org/rB8f1951f555f56c4db64905918911773ee19c2b3f

UI Particles: Move message about parting inside Parting panel.

Grayout parting settings if using virtual parents, and minor layout
adjustment: align min and max sliders together.

===================================================================

M	release/scripts/startup/bl_ui/properties_particle.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 7167be362ad..2a6913a8584 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -1610,9 +1610,6 @@ class PARTICLE_PT_children(ParticleButtonsPanel, Panel):
             col.separator()
             col.prop(part, "child_radius", text="Radius")
             col.prop(part, "child_roundness", text="Roundness", slider=True)
-        elif part.virtual_parents > 0.0:
-            sub = col.column(align=True)
-            sub.label(text="Parting not available with virtual parents")
 
 
 class PARTICLE_PT_children_parting(ParticleButtonsPanel, Panel):
@@ -1630,13 +1627,20 @@ class PARTICLE_PT_children_parting(ParticleButtonsPanel, Panel):
         layout = self.layout
 
         part = particle_get_settings(context)
+        is_virtual = part.virtual_parents > 0.0
 
         layout.use_property_split = True
 
+        if is_virtual:
+            layout.label(text="Parting not available with virtual parents")
+
         col = layout.column()
+        col.active = not is_virtual
         col.prop(part, "child_parting_factor", text="Parting", slider=True)
-        col.prop(part, "child_parting_min", text="Min")
-        col.prop(part, "child_parting_max", text="Max")
+
+        sub = col.column(align=True)
+        sub.prop(part, "child_parting_min", text="Min")
+        sub.prop(part, "child_parting_max", text="Max")
 
 
 class PARTICLE_PT_children_clumping(ParticleButtonsPanel, Panel):



More information about the Bf-blender-cvs mailing list