From 971ffd8fad73554e166d26d2a698ab7974cac497 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 3 Jul 2012 12:40:19 +0000 Subject: Fix [#31977] Export Animated Mesh, terminate baking in fluid-sim * Elbeem exporter code now overrides user settings to No Slip in case the object is animated; * UI of fluid obstacles now disables slip settings when export animated is enabled; * Added in this later option's tooltip a mention that it enforces No Slip! --- release/scripts/startup/bl_ui/properties_physics_fluid.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'release/scripts/startup/bl_ui/properties_physics_fluid.py') diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 751f3e18acc..a53c1c97336 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -117,10 +117,14 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): col.prop(fluid, "use_animated_mesh") col = split.column() - col.label(text="Slip Type:") - col.prop(fluid, "slip_type", text="") + subsplit = col.split() + subcol = subsplit.column() + if fluid.use_animated_mesh: + subcol.enabled = False + subcol.label(text="Slip Type:") + subcol.prop(fluid, "slip_type", text="") if fluid.slip_type == 'PARTIALSLIP': - col.prop(fluid, "partial_slip_factor", slider=True, text="Amount") + subcol.prop(fluid, "partial_slip_factor", slider=True, text="Amount") col.label(text="Impact:") col.prop(fluid, "impact_factor", text="Factor") -- cgit v1.2.3