[Bf-blender-cvs] [d85887e5cef] temp-checkbox-layout-tweaks: Fix expanded enums using columns within split layout

Julian Eisel noreply at git.blender.org
Thu Apr 16 21:27:07 CEST 2020


Commit: d85887e5cef256b945f1391104f31c25e9a9bbc7
Author: Julian Eisel
Date:   Thu Apr 16 21:26:11 2020 +0200
Branches: temp-checkbox-layout-tweaks
https://developer.blender.org/rBd85887e5cef256b945f1391104f31c25e9a9bbc7

Fix expanded enums using columns within split layout

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

M	source/blender/editors/interface/interface_layout.c

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

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 5309c43aba7..80e248650e5 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2222,15 +2222,15 @@ void uiItemFullR(uiLayout *layout,
      * heading itself. */
     ui_layout_heading_label_add(heading_layout, heading_layout, false, false);
   }
-  else if (inside_prop_sep) {
-    /* When placing further items in a split row, add them to a column so they match the column
-     * layout of previous items (e.g. transform vector with lock icon for each item). */
-    layout = uiLayoutColumn(layout_parent, true);
-    layout->space = 0;
-  }
 
   /* array property */
   if (index == RNA_NO_INDEX && is_array) {
+    if (inside_prop_sep) {
+      /* Within a split row, add array items to a column so they match the column layout of
+       * previous items (e.g. transform vector with lock icon for each item). */
+      layout = uiLayoutColumn(layout, true);
+    }
+
     ui_item_array(layout,
                   block,
                   name,



More information about the Bf-blender-cvs mailing list