[Bf-blender-cvs] [153195da22e] blender2.8: UI: Single-column layout for Texture Color

William Reynish noreply at git.blender.org
Mon Jun 25 17:05:08 CEST 2018


Commit: 153195da22e472aa09af0505ac9cd64039a6d910
Author: William Reynish
Date:   Mon Jun 25 17:01:50 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB153195da22e472aa09af0505ac9cd64039a6d910

UI: Single-column layout for Texture Color

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index e5bf2c910a0..16e29d1ecc8 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -211,30 +211,25 @@ class TEXTURE_PT_colors(TextureButtonsPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
+        layout.use_property_split = True
 
         tex = context.texture
 
-        layout.prop(tex, "use_color_ramp", text="Ramp")
-        if tex.use_color_ramp:
-            layout.template_color_ramp(tex, "color_ramp", expand=True)
-
-        split = layout.split()
-
-        col = split.column()
-        col.label(text="RGB Multiply:")
+        col = layout.column()
         sub = col.column(align=True)
-        sub.prop(tex, "factor_red", text="R")
+        sub.prop(tex, "factor_red", text="Multiply R")
         sub.prop(tex, "factor_green", text="G")
         sub.prop(tex, "factor_blue", text="B")
 
-        col = split.column()
-        col.label(text="Adjust:")
         col.prop(tex, "intensity")
         col.prop(tex, "contrast")
         col.prop(tex, "saturation")
 
-        col = layout.column()
         col.prop(tex, "use_clamp", text="Clamp")
+        col.prop(tex, "use_color_ramp", text="Ramp")
+        if tex.use_color_ramp:
+            layout.use_property_split = False
+            layout.template_color_ramp(tex, "color_ramp", expand=True)
 
 
 class TextureTypePanel(TextureButtonsPanel):



More information about the Bf-blender-cvs mailing list