[Bf-blender-cvs] [caa357dae70] master: Cleanup: typo in variable name

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


Commit: caa357dae70322e2fa64d4f3501a5aa8ff812a39
Author: Campbell Barton
Date:   Sat Mar 23 00:01:00 2019 +1100
Branches: master
https://developer.blender.org/rBcaa357dae70322e2fa64d4f3501a5aa8ff812a39

Cleanup: typo in variable name

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

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 8329ddfed48..d5254b59ab9 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1577,7 +1577,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 	 *
 	 * Keep using 'use_prop_sep' instead of disabling it entirely because
 	 * we need the ability to have decorators still. */
-	bool use_prop_set_split_label = use_prop_sep;
+	bool use_prop_sep_split_label = use_prop_sep;
 
 #ifdef UI_PROP_DECORATE
 	struct {
@@ -1612,7 +1612,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 #ifdef UI_PROP_SEP_ICON_WIDTH_EXCEPTION
 	if (use_prop_sep) {
 		if (type == PROP_BOOLEAN && (icon == ICON_NONE) && !icon_only) {
-			use_prop_set_split_label = false;
+			use_prop_sep_split_label = false;
 		}
 	}
 #endif
@@ -1706,7 +1706,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 		}
 #endif  /* UI_PROP_DECORATE */
 
-		if ((name[0] == '\0') || (use_prop_set_split_label == false)) {
+		if ((name[0] == '\0') || (use_prop_sep_split_label == false)) {
 			/* Ensure we get a column when text is not set. */
 			layout = uiLayoutColumn(layout_row ? layout_row : layout, true);
 			layout->space = 0;
@@ -1797,7 +1797,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 	if (index == RNA_NO_INDEX && is_array) {
 		ui_item_array(
 		        layout, block, name, icon, ptr, prop, len, 0, 0, w, h,
-		        expand, slider, toggle, icon_only, compact, !use_prop_set_split_label);
+		        expand, slider, toggle, icon_only, compact, !use_prop_sep_split_label);
 	}
 	/* enum item */
 	else if (type == PROP_ENUM && index == RNA_ENUM_VALUE) {
@@ -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_set_split_label == false) {
+		if (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