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

1 files changed, 34 insertions, 31 deletions

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 138379b1bb9..f5a303033a3 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -77,7 +77,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 	}
 
 	/* type unsigned, no need to chech < 0 */
-	if(type < NUM_MODIFIER_TYPES && types[type]->name[0] != '\0') {
+	if (type < NUM_MODIFIER_TYPES && types[type]->name[0] != '\0') {
 		return types[type];
 	}
 	else {
@@ -205,8 +205,8 @@ void modifiers_foreachIDLink(Object *ob, IDWalkFunc walk, void *userData)
 	for (; md; md=md->next) {
 		ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-		if(mti->foreachIDLink) mti->foreachIDLink(md, ob, walk, userData);
-		else if(mti->foreachObjectLink) {
+		if (mti->foreachIDLink) mti->foreachIDLink(md, ob, walk, userData);
+		else if (mti->foreachObjectLink) {
 			/* each Object can masquerade as an ID, so this should be OK */
 			ObjectWalkFunc fp = (ObjectWalkFunc)walk;
 			mti->foreachObjectLink(md, ob, fp, userData);
@@ -221,7 +221,7 @@ void modifiers_foreachTexLink(Object *ob, TexWalkFunc walk, void *userData)
 	for (; md; md=md->next) {
 		ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-		if(mti->foreachTexLink)
+		if (mti->foreachTexLink)
 			mti->foreachTexLink(md, ob, walk, userData);
 	}
 }
@@ -290,7 +290,7 @@ int modifiers_getCageIndex(struct Scene *scene, Object *ob, int *lastPossibleCag
 	ModifierData *md = (virtual_)? modifiers_getVirtualModifierList(ob): ob->modifiers.first;
 	int i, cageIndex = -1;
 
-	if(lastPossibleCageIndex_r) {
+	if (lastPossibleCageIndex_r) {
 		/* ensure the value is initialized */
 		*lastPossibleCageIndex_r= -1;
 	}
@@ -346,11 +346,11 @@ int modifier_isEnabled(struct Scene *scene, ModifierData *md, int required_mode)
 
 	md->scene= scene;
 
-	if((md->mode & required_mode) != required_mode) return 0;
-	if(mti->isDisabled && mti->isDisabled(md, required_mode == eModifierMode_Render)) return 0;
-	if(md->mode & eModifierMode_DisableTemporary) return 0;
-	if(required_mode & eModifierMode_Editmode)
-		if(!(mti->flags & eModifierTypeFlag_SupportsEditmode)) return 0;
+	if ((md->mode & required_mode) != required_mode) return 0;
+	if (mti->isDisabled && mti->isDisabled(md, required_mode == eModifierMode_Render)) return 0;
+	if (md->mode & eModifierMode_DisableTemporary) return 0;
+	if (required_mode & eModifierMode_Editmode)
+		if (!(mti->flags & eModifierTypeFlag_SupportsEditmode)) return 0;
 	
 	return 1;
 }
@@ -361,12 +361,12 @@ LinkNode *modifiers_calcDataMasks(struct Scene *scene, Object *ob, ModifierData
 	LinkNode *curr, *prev;
 
 	/* build a list of modifier data requirements in reverse order */
-	for(; md; md = md->next) {
+	for (; md; md = md->next) {
 		ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 		CustomDataMask mask = 0;
 
-		if(modifier_isEnabled(scene, md, required_mode))
-			if(mti->requiredDataMask)
+		if (modifier_isEnabled(scene, md, required_mode))
+			if (mti->requiredDataMask)
 				mask = mti->requiredDataMask(ob, md);
 
 		BLI_linklist_prepend(&dataMasks, SET_INT_IN_POINTER(mask));
@@ -378,13 +378,14 @@ LinkNode *modifiers_calcDataMasks(struct Scene *scene, Object *ob, ModifierData
 	 * note the list is currently in reverse order, so "masks that follow it"
 	 * actually means "masks that precede it" at the moment
 	 */
-	for(curr = dataMasks, prev = NULL; curr; prev = curr, curr = curr->next) {
-		if(prev) {
+	for (curr = dataMasks, prev = NULL; curr; prev = curr, curr = curr->next) {
+		if (prev) {
 			CustomDataMask prev_mask = (CustomDataMask)GET_INT_FROM_POINTER(prev->link);
 			CustomDataMask curr_mask = (CustomDataMask)GET_INT_FROM_POINTER(curr->link);
 
 			curr->link = SET_INT_IN_POINTER(curr_mask | prev_mask);
-		} else {
+		}
+		else {
 			CustomDataMask curr_mask = (CustomDataMask)GET_INT_FROM_POINTER(curr->link);
 
 			curr->link = SET_INT_IN_POINTER(curr_mask | dataMask);
@@ -405,8 +406,8 @@ ModifierData *modifiers_getLastPreview(struct Scene *scene, ModifierData *md, in
 		return tmp_md;
 
 	/* Find the latest modifier in stack generating preview. */
-	for(; md; md = md->next) {
-		if(modifier_isEnabled(scene, md, required_mode) && modifier_isPreview(md))
+	for (; md; md = md->next) {
+		if (modifier_isEnabled(scene, md, required_mode) && modifier_isPreview(md))
 			tmp_md = md;
 	}
 	return tmp_md;
@@ -451,18 +452,20 @@ ModifierData *modifiers_getVirtualModifierList(Object *ob)
 
 	md = ob->modifiers.first;
 
-	if(ob->parent) {
-		if(ob->parent->type==OB_ARMATURE && ob->partype==PARSKEL) {
+	if (ob->parent) {
+		if (ob->parent->type==OB_ARMATURE && ob->partype==PARSKEL) {
 			amd.object = ob->parent;
 			amd.modifier.next = md;
 			amd.deformflag= ((bArmature *)(ob->parent->data))->deformflag;
 			md = &amd.modifier;
-		} else if(ob->parent->type==OB_CURVE && ob->partype==PARSKEL) {
+		}
+		else if (ob->parent->type==OB_CURVE && ob->partype==PARSKEL) {
 			cmd.object = ob->parent;
 			cmd.defaxis = ob->trackflag + 1;
 			cmd.modifier.next = md;
 			md = &cmd.modifier;
-		} else if(ob->parent->type==OB_LATTICE && ob->partype==PARSKEL) {
+		}
+		else if (ob->parent->type==OB_LATTICE && ob->partype==PARSKEL) {
 			lmd.object = ob->parent;
 			lmd.modifier.next = md;
 			md = &lmd.modifier;
@@ -470,8 +473,8 @@ ModifierData *modifiers_getVirtualModifierList(Object *ob)
 	}
 
 	/* shape key modifier, not yet for curves */
-	if(ELEM(ob->type, OB_MESH, OB_LATTICE) && ob_get_key(ob)) {
-		if(ob->type == OB_MESH && (ob->shapeflag & OB_SHAPE_EDIT_MODE))
+	if (ELEM(ob->type, OB_MESH, OB_LATTICE) && ob_get_key(ob)) {
+		if (ob->type == OB_MESH && (ob->shapeflag & OB_SHAPE_EDIT_MODE))
 			smd.modifier.mode |= eModifierMode_Editmode|eModifierMode_OnCage;
 		else
 			smd.modifier.mode &= ~eModifierMode_Editmode|eModifierMode_OnCage;
@@ -562,9 +565,9 @@ int modifiers_isCorrectableDeformed(Object *ob)
 	ModifierData *md = modifiers_getVirtualModifierList(ob);
 	
 	for (; md; md=md->next) {
-		if(ob->mode==OB_MODE_EDIT && (md->mode & eModifierMode_Editmode)==0);
+		if (ob->mode==OB_MODE_EDIT && (md->mode & eModifierMode_Editmode)==0);
 		else 
-			if(modifier_isCorrectableDeformed(md))
+			if (modifier_isCorrectableDeformed(md))
 				return 1;
 	}
 	return 0;
@@ -596,10 +599,10 @@ int modifiers_indexInObject(Object *ob, ModifierData *md_seek)
 
 void modifier_freeTemporaryData(ModifierData *md)
 {
-	if(md->type == eModifierType_Armature) {
+	if (md->type == eModifierType_Armature) {
 		ArmatureModifierData *amd= (ArmatureModifierData*)md;
 
-		if(amd->prevCos) {
+		if (amd->prevCos) {
 			MEM_freeN(amd->prevCos);
 			amd->prevCos= NULL;
 		}
@@ -614,10 +617,10 @@ void test_object_modifiers(Object *ob)
 	/* just multires checked for now, since only multires
 	 * modifies mesh data */
 
-	if(ob->type != OB_MESH) return;
+	if (ob->type != OB_MESH) return;
 
-	for(md = ob->modifiers.first; md; md = md->next) {
-		if(md->type == eModifierType_Multires) {
+	for (md = ob->modifiers.first; md; md = md->next) {
+		if (md->type == eModifierType_Multires) {
 			MultiresModifierData *mmd = (MultiresModifierData*)md;
 
 			multiresModifier_set_levels_from_disps(mmd, ob);