[Bf-blender-cvs] [4b6d9f0] fluid-mantaflow: reorganized ui for flow behaviour field

[Sebastián Barschkis]

Commit: 4b6d9f0a8d623d2d0d46d35a0d48096a6772bd53
Author: Sebastián Barschkis
Date:   Sat Jul 23 12:04:58 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB4b6d9f0a8d623d2d0d46d35a0d48096a6772bd53

reorganized ui for flow behaviour field

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index 77dc9eb..5184ad6 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -76,6 +76,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
             flow = md.flow_settings
 
             layout.prop(flow, "smoke_flow_type", expand=False)
+            layout.prop(flow, "smoke_flow_behavior", expand=False)
 
             if flow.smoke_flow_type != 'LIQUID':
                 split = layout.split()
@@ -104,20 +105,16 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
                     #sub.prop(flow, "velocity_random")
 
                 col = split.column()
-                col.label(text="Flow behavior:")
-                col.prop(flow, "smoke_flow_behavior", text="")
-
-                sub = col.column()
-                sub.label(text="Initial Values:")
-                sub.prop(flow, "use_absolute")
+                col.label(text="Initial Values:")
+                col.prop(flow, "use_absolute")
                 if flow.smoke_flow_type in {'SMOKE', 'BOTH'}:
-                    sub.prop(flow, "density")
-                    sub.prop(flow, "temperature")
-                    sub.prop(flow, "smoke_color")
+                    col.prop(flow, "density")
+                    col.prop(flow, "temperature")
+                    col.prop(flow, "smoke_color")
                 if flow.smoke_flow_type in {'FIRE', 'BOTH'}:
-                    sub.prop(flow, "fuel_amount")
-                sub.label(text="Sampling:")
-                sub.prop(flow, "subframes")
+                    col.prop(flow, "fuel_amount")
+                col.label(text="Sampling:")
+                col.prop(flow, "subframes")
 
         elif md.smoke_type == 'COLLISION':
             coll = md.coll_settings