[Bf-blender-cvs] [8f3ecd08e1e] master: Fix checkboxes being right aligned when property split is disabled

Campbell Barton noreply at git.blender.org
Fri Mar 22 14:04:02 CET 2019


Commit: 8f3ecd08e1e458cd9de06f17cecd38ce535d2048
Author: Campbell Barton
Date:   Sat Mar 23 00:02:07 2019 +1100
Branches: master
https://developer.blender.org/rB8f3ecd08e1e458cd9de06f17cecd38ce535d2048

Fix checkboxes being right aligned when property split is disabled

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

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 d5254b59ab9..e4f5c165aec 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1839,7 +1839,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 		if (layout->activate_init)
 			UI_but_flag_enable(but, UI_BUT_ACTIVATE_ON_INIT);
 
-		if (use_prop_sep_split_label == false) {
+		if (use_prop_sep && (use_prop_sep_split_label == false)) {
 			/* When the button uses it's own text right align it. */
 			but->drawflag |= UI_BUT_TEXT_RIGHT;
 			but->drawflag &= ~UI_BUT_TEXT_LEFT;



More information about the Bf-blender-cvs mailing list