Commit: 60e5963bafa0a8f05c9ecabe35c9b0c61479486e
Author: Sebastián Barschkis
Date: Fri Nov 2 17:06:18 2018 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB60e5963bafa0a8f05c9ecabe35c9b0c61479486e
Mantaflow: Updated particle and fluid modifier UI
Made path field accessible after bake and removed obsolete UI text in particle
settings
===================================================================
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_smoke.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_particle.py
b/release/scripts/startup/bl_ui/properties_particle.py
index 070593f1189..444a53701fb 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -196,20 +196,17 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel,
Panel):
split = layout.split(factor=0.32)
col = split.column()
- if (part.is_fluid is False) or (part.is_manta is False):
+ if (part.is_fluid is False) and (part.is_manta is False):
col.label(text="Settings:")
col.label(text="Type:")
col = split.column()
- if (part.is_fluid is False) or (part.is_manta is False):
+ if (part.is_fluid is False) and (part.is_manta is False):
row = col.row()
row.enabled = particle_panel_enabled(context, psys)
row.template_ID(psys, "settings", new="particle.new")
- if part.is_fluid:
- layout.label(text=iface_("%d fluid particles for this frame")
% part.count, translate=False)
- return
- if part.is_manta:
+ if part.is_fluid or part.is_manta:
layout.label(text=iface_("%d fluid particles for this frame")
% part.count, translate=False)
return
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py
b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index df4023ea94b..1b243da99d3 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -719,7 +719,7 @@ class PHYSICS_PT_manta_particles(PhysicButtonsPanel, Panel):
using_particles = domain.use_spray_particles or
domain.use_foam_particles or domain.use_bubble_particles
flow = layout.grid_flow(row_major=True, columns=0, even_columns=True,
even_rows=False, align=False)
- flow.enabled = not baking_any and not baked_particles
+ flow.enabled = not baking_any
subSpray = flow.column()
subSpray.enabled = (domain.sndparticle_combined_export == 'OFF') or
(domain.sndparticle_combined_export == 'FOAM + BUBBLES')
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
