style cleanup: follow style guide for formatting of if/for/while loops, and else if's

1 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 6692bd7bea8..91b37896e66 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -60,12 +60,12 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 		{
 			int arraylen= RNA_property_array_length(ptr, prop);
 
-			if(arraylen && index == -1)
+			if (arraylen && index == -1)
 				return NULL;
 			
-			if(icon && name && name[0] == '\0')
+			if (icon && name && name[0] == '\0')
 				but = uiDefIconButR_prop(block, ICONTOG, 0, icon, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
-			else if(icon)
+			else if (icon)
 				but = uiDefIconTextButR_prop(block, ICONTOG, 0, icon, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 			else
 				but = uiDefButR_prop(block, OPTION, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
@@ -76,28 +76,28 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 		{
 			int arraylen= RNA_property_array_length(ptr, prop);
 
-			if(arraylen && index == -1) {
-				if(ELEM(RNA_property_subtype(prop), PROP_COLOR, PROP_COLOR_GAMMA))
+			if (arraylen && index == -1) {
+				if (ELEM(RNA_property_subtype(prop), PROP_COLOR, PROP_COLOR_GAMMA))
 					but = uiDefButR_prop(block, COL, 0, name, x1, y1, x2, y2, ptr, prop, 0, 0, 0, -1, -1, NULL);
 			}
-			else if(RNA_property_subtype(prop) == PROP_PERCENTAGE || RNA_property_subtype(prop) == PROP_FACTOR)
+			else if (RNA_property_subtype(prop) == PROP_PERCENTAGE || RNA_property_subtype(prop) == PROP_FACTOR)
 				but = uiDefButR_prop(block, NUMSLI, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 			else
 				but = uiDefButR_prop(block, NUM, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 			break;
 		}
 		case PROP_ENUM:
-			if(icon && name && name[0] == '\0')
+			if (icon && name && name[0] == '\0')
 				but = uiDefIconButR_prop(block, MENU, 0, icon, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
-			else if(icon)
+			else if (icon)
 				but = uiDefIconTextButR_prop(block, MENU, 0, icon, NULL, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 			else
 				but = uiDefButR_prop(block, MENU, 0, NULL, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 			break;
 		case PROP_STRING:
-			if(icon && name && name[0] == '\0')
+			if (icon && name && name[0] == '\0')
 				but = uiDefIconButR_prop(block, TEX, 0, icon, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
-			else if(icon)
+			else if (icon)
 				but = uiDefIconTextButR_prop(block, TEX, 0, icon, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 			else
 				but = uiDefButR_prop(block, TEX, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
@@ -106,10 +106,10 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 			PointerRNA pptr;
 
 			pptr= RNA_property_pointer_get(ptr, prop);
-			if(!pptr.type)
+			if (!pptr.type)
 				pptr.type= RNA_property_pointer_type(ptr, prop);
 			icon= RNA_struct_ui_icon(pptr.type);
-			if(icon == ICON_DOT)
+			if (icon == ICON_DOT)
 				icon= 0;
 
 			but = uiDefIconTextButR_prop(block, IDPOIN, 0, icon, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
@@ -141,22 +141,22 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(Pointe
 
 	RNA_STRUCT_BEGIN(ptr, prop) {
 		flag= RNA_property_flag(prop);
-		if(flag & PROP_HIDDEN || (check_prop && check_prop(ptr, prop)==FALSE))
+		if (flag & PROP_HIDDEN || (check_prop && check_prop(ptr, prop)==FALSE))
 			continue;
 
-		if(label_align != '\0') {
+		if (label_align != '\0') {
 			PropertyType type = RNA_property_type(prop);
 			int is_boolean = (type == PROP_BOOLEAN && !RNA_property_array_check(prop));
 
 			name= RNA_property_ui_name(prop);
 
-			if(label_align=='V') {
+			if (label_align=='V') {
 				col= uiLayoutColumn(layout, 1);
 
-				if(!is_boolean)
+				if (!is_boolean)
 					uiItemL(col, name, ICON_NONE);
 			}
-			else if(label_align=='H') {
+			else if (label_align=='H') {
 				split = uiLayoutSplit(layout, 0.5f, 0);
 
 				col= uiLayoutColumn(split, 0);
@@ -194,16 +194,16 @@ int uiIconFromID(ID *id)
 	PointerRNA ptr;
 	short idcode;
 
-	if(id==NULL)
+	if (id==NULL)
 		return ICON_NONE;
 	
 	idcode= GS(id->name);
 
 	/* exception for objects */
-	if(idcode == ID_OB) {
+	if (idcode == ID_OB) {
 		ob= (Object*)id;
 
-		if(ob->type == OB_EMPTY)
+		if (ob->type == OB_EMPTY)
 			return ICON_EMPTY_DATA;
 		else
 			return uiIconFromID(ob->data);