[Bf-blender-cvs] [e64269b] fluid-mantaflow: UI changes: renamed modifier label and some preparations for liquid high res mode

[Sebastián Barschkis]

Commit: e64269b8fc1e24b586d6db78468c54f836c23de2
Author: Sebastián Barschkis
Date:   Wed Aug 10 22:10:45 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBe64269b8fc1e24b586d6db78468c54f836c23de2

UI changes: renamed modifier label and some preparations for liquid high res mode

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

M	release/scripts/startup/bl_ui/properties_physics_common.py
M	release/scripts/startup/bl_ui/properties_physics_smoke.py

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

diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py
index 82eecf0..ef4b7e7 100644
--- a/release/scripts/startup/bl_ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -82,8 +82,8 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
             physics_add(self, col, context.soft_body, "Soft Body", 'SOFT_BODY', 'MOD_SOFT', True)
 
         if obj.type == 'MESH':
-            physics_add(self, col, context.fluid, "Fluid", 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True)
-            physics_add(self, col, context.smoke, "Smoke", 'SMOKE', 'MOD_SMOKE', True)
+            physics_add(self, col, context.fluid, "Fluid (Elbeem)", 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True)
+            physics_add(self, col, context.smoke, "Fluid (Mantaflow)", 'SMOKE', 'MOD_SMOKE', True)
 
             physics_add_special(self, col, obj.rigid_body, "Rigid Body",
                                 "rigidbody.object_add",
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index ac63c1a..86d915c 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -237,7 +237,6 @@ class PHYSICS_PT_smoke_adaptive_domain(PhysicButtonsPanel, Panel):
 
 class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, Panel):
     bl_label = "Fluid Quality"
-    bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
     def poll(cls, context):
@@ -266,23 +265,22 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, Panel):
 
         split = layout.split()
 
-        if domain.smoke_domain_type == 'GAS': # high resolution only for gases right now
-            col = split.column()
-            col.prop(domain, "use_high_resolution", text="High resolution")
-            sub = col.column()
-            sub.active = domain.use_high_resolution
-            sub.prop(domain, "amplify", text="Divisions")
-            sub.label(text="Flow Sampling:")
-            sub.row().prop(domain, "highres_sampling", text="")
-            sub.prop(domain, "show_high_resolution")
-
-            sub = split.column()
-            sub.active = domain.use_high_resolution
-            sub.label(text="Noise Method:")
-            sub.row().prop(domain, "noise_type", text="")
-            sub.prop(domain, "strength")
-            sub.prop(domain, "noise_pos_scale")
-            sub.prop(domain, "noise_time_anim")
+        col = split.column()
+        col.prop(domain, "use_high_resolution", text="High resolution")
+        sub = col.column()
+        sub.active = domain.use_high_resolution
+        sub.prop(domain, "amplify", text="Divisions")
+        sub.label(text="Flow Sampling:")
+        sub.row().prop(domain, "highres_sampling", text="")
+        sub.prop(domain, "show_high_resolution")
+
+        sub = split.column()
+        sub.active = domain.use_high_resolution and domain.smoke_domain_type == 'GAS'
+        sub.label(text="Noise Method:")
+        sub.row().prop(domain, "noise_type", text="")
+        sub.prop(domain, "strength")
+        sub.prop(domain, "noise_pos_scale")
+        sub.prop(domain, "noise_time_anim")
 
 class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, Panel):
     bl_label = "Fluid Groups"