[Bf-blender-cvs] [4a3bcfa1026] master: Fix T97100: Fix ordering in color attribute list items

Joseph Eagar noreply at git.blender.org
Tue Apr 12 08:11:25 CEST 2022


Commit: 4a3bcfa1026b0be5a87f6540e61b94241bd91e3b
Author: Joseph Eagar
Date:   Mon Apr 11 23:08:23 2022 -0700
Branches: master
https://developer.blender.org/rB4a3bcfa1026b0be5a87f6540e61b94241bd91e3b

Fix T97100: Fix ordering in color attribute list items

The new tab in the properties panel for "Color Attributes" shows the
data type and domain, just like the Attributes tab.
The issue is that the UI does not scale well and can only display the
full names when dragged to an extreme width.
This is due to the inclusion of the render icon in between the
attribute name and attribute type description.

This patch changes the order that items are displayed in the Color
Attributes Panel. Moving the render icon to the very right.
The result is consistent with other parts of the Blender UI and does
not take as much space to display the full text.

Reviewed By: @jbakker
Differential Revision: https://developer.blender.org/D14567
Ref D14567

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 63699f96834..716dc02ec30 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 63699f968344db7dc853d2c5972325beea44900c
+Subproject commit 716dc02ec30c0810513f7b4adc4ae865ae50c4e6
diff --git a/release/scripts/addons b/release/scripts/addons
index 4d53ec76a3d..787ea78f7fa 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 4d53ec76a3d8b0a72fcc7a795067a159ce6dcd2c
+Subproject commit 787ea78f7fa6f0373d80ba1247768402df93f8ad
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 1bfd82cc790..1ba7a4a5413 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -599,20 +599,21 @@ class MESH_UL_color_attributes(UIList, ColorAttributesListBase):
         split.emboss = 'NONE'
         split.prop(attribute, "name", text="")
 
-        active_render = _index == data.color_attributes.render_color_index
+        sub = split.row()
+        sub.alignment = 'RIGHT'
+        sub.active = False
+        sub.label(text="%s ▶ %s" % (domain_name, data_type.name))
 
-        props = split.operator(
+        active_render = _index == data.color_attributes.render_color_index
+        
+        row = layout.row()
+        row.emboss = 'NONE'
+        prop = row.operator(
             "geometry.color_attribute_render_set",
             text="",
             icon='RESTRICT_RENDER_OFF' if active_render else 'RESTRICT_RENDER_ON',
         )
-
-        props.name = attribute.name
-
-        sub = split.row()
-        sub.alignment = 'RIGHT'
-        sub.active = False
-        sub.label(text="%s ▶ %s" % (domain_name, data_type.name))
+        prop.name = attribute.name
 
 
 class MESH_UL_color_attributes_selector(UIList, ColorAttributesListBase):
diff --git a/source/tools b/source/tools
index f4af5ed5a70..1e658ca996f 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit f4af5ed5a705c5d048b137ba56a6cf9295681ec5
+Subproject commit 1e658ca996f11e5ff3398d89bd81f5b719304a57



More information about the Bf-blender-cvs mailing list