[Bf-blender-cvs] [244cb8410ed] blender2.8: UI: Single column for Rigid Body World

William Reynish noreply at git.blender.org
Thu Jun 21 12:41:13 CEST 2018


Commit: 244cb8410edfef0f1046cd6dd2096dd1d47cd08e
Author: William Reynish
Date:   Thu Jun 21 12:41:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB244cb8410edfef0f1046cd6dd2096dd1d47cd08e

UI: Single column for Rigid Body World

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py
index b26fbb9e906..46cb7d0761f 100644
--- a/release/scripts/startup/bl_ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -139,14 +139,16 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
                 layout.enabled = False
 
     if not cache.use_external or cachetype == 'SMOKE':
-        row = layout.row(align=True)
+        col = layout.column(align=True)
+        col.use_property_split = True
 
         if cachetype not in {'PSYS', 'DYNAMIC_PAINT'}:
-            row.enabled = enabled
-            row.prop(cache, "frame_start")
-            row.prop(cache, "frame_end")
+
+            col.enabled = enabled
+            col.prop(cache, "frame_start", text="Simulation Start")
+            col.prop(cache, "frame_end")
         if cachetype not in {'SMOKE', 'CLOTH', 'DYNAMIC_PAINT', 'RIGID_BODY'}:
-            row.prop(cache, "frame_step")
+            col.prop(cache, "frame_step")
 
         if cachetype != 'SMOKE':
             layout.label(text=cache.info)
@@ -206,9 +208,12 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
 
 def effector_weights_ui(self, context, weights, weight_type):
     layout = self.layout
+    layout.use_property_split = True
 
     layout.prop(weights, "group")
 
+    layout.use_property_split = False
+
     split = layout.split()
 
     split.prop(weights, "gravity", slider=True)
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index a4991ef5718..43706c360da 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -369,6 +369,7 @@ class SCENE_PT_rigid_body_world(SceneButtonsPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
 
         scene = context.scene
 
@@ -386,13 +387,11 @@ class SCENE_PT_rigid_body_world(SceneButtonsPanel, Panel):
             col.prop(rbw, "group")
             col.prop(rbw, "constraints")
 
-            split = col.split()
-
-            col = split.column()
+            col = col.column()
             col.prop(rbw, "time_scale", text="Speed")
             col.prop(rbw, "use_split_impulse")
 
-            col = split.column()
+            col = col.column()
             col.prop(rbw, "steps_per_second", text="Steps Per Second")
             col.prop(rbw, "solver_iterations", text="Solver Iterations")



More information about the Bf-blender-cvs mailing list