[Bf-blender-cvs] [2bd08d5] fluid-mantaflow: just some ui changes for the liquid domain switcher
Sebastián Barschkis
noreply at git.blender.org
Wed Jun 8 00:27:52 CEST 2016
Commit: 2bd08d59d60b5b9a4050194b791dd0f21f94db5a
Author: Sebastián Barschkis
Date: Sun Jun 5 00:20:53 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB2bd08d59d60b5b9a4050194b791dd0f21f94db5a
just some ui changes for the liquid domain switcher
===================================================================
M release/scripts/startup/bl_operators/object_quick_effects.py
M release/scripts/startup/bl_ui/properties_physics_smoke.py
===================================================================
diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py
index 414855c..b524521 100644
--- a/release/scripts/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@@ -306,6 +306,7 @@ class QuickSmoke(Operator):
items=(('SMOKE', "Smoke", ""),
('FIRE', "Fire", ""),
('BOTH', "Smoke + Fire", ""),
+ ('LIQUID', "Liquid", ""),
),
default='SMOKE',
)
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index 34b719b..12c4075 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -54,6 +54,8 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel):
if md.smoke_type == 'DOMAIN':
domain = md.domain_settings
+ layout.prop(domain, "smoke_domain_type", expand=False)
+
split = layout.split()
split.enabled = not domain.point_cache.is_baked
@@ -78,7 +80,6 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel):
sub.prop(domain, "use_dissolve_smoke_log", text="Slow")
elif md.smoke_type == 'FLOW':
-
flow = md.flow_settings
layout.prop(flow, "smoke_flow_type", expand=False)
More information about the Bf-blender-cvs
mailing list