[Bf-blender-cvs] [243a9254ea5] master: Fix warning for uninitialized icon_only

Dalai Felinto noreply at git.blender.org
Fri Mar 22 20:08:27 CET 2019


Commit: 243a9254ea579915e697cfde59e9c4f6e9ffd4ee
Author: Dalai Felinto
Date:   Fri Mar 22 16:01:25 2019 -0300
Branches: master
https://developer.blender.org/rB243a9254ea579915e697cfde59e9c4f6e9ffd4ee

Fix warning for uninitialized icon_only

Warning/issue introduced on rBcaa357dae70322e.

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

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 e4f5c165aec..98e25e1b90f 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1599,9 +1599,11 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 	is_array = RNA_property_array_check(prop);
 	len = (is_array) ? RNA_property_array_length(ptr, prop) : 0;
 
+	icon_only = (flag & UI_ITEM_R_ICON_ONLY) != 0;
+
 	/* set name and icon */
 	if (!name) {
-		if ((flag & UI_ITEM_R_ICON_ONLY) == 0) {
+		if (!icon_only) {
 			name = RNA_property_ui_name(prop);
 		}
 		else {
@@ -1682,7 +1684,6 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
 	slider = (flag & UI_ITEM_R_SLIDER) != 0;
 	toggle = (flag & UI_ITEM_R_TOGGLE) != 0;
 	expand = (flag & UI_ITEM_R_EXPAND) != 0;
-	icon_only = (flag & UI_ITEM_R_ICON_ONLY) != 0;
 	no_bg = (flag & UI_ITEM_R_NO_BG) != 0;
 	compact = (flag & UI_ITEM_R_COMPACT) != 0;



More information about the Bf-blender-cvs mailing list