From 2d2d36fe3b2f3e7eed7d05714abc80f1a5a82303 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 20 May 2012 19:49:27 +0000
Subject: code cleanup: - style - multi-line ifs move braces onto new lines. -
 iterators - convert some to macros, other split up and move brace.

---
 source/blender/blenloader/intern/readfile.c          | 8 ++------
 source/blender/blenloader/intern/versioning_250.c    | 2 +-
 source/blender/blenloader/intern/versioning_legacy.c | 8 ++++----
 source/blender/blenloader/intern/writefile.c         | 2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'source/blender/blenloader')

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 2b5eebb0f73..06fd2bdfd98 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5025,12 +5025,8 @@ static void direct_link_scene(FileData *fd, Scene *sce)
 			if (seq->strip && seq->strip->done==0) {
 				seq->strip->done = TRUE;
 				
-				if (seq->type == SEQ_IMAGE ||
-				   seq->type == SEQ_MOVIE ||
-				   seq->type == SEQ_RAM_SOUND ||
-				   seq->type == SEQ_HD_SOUND) {
-					seq->strip->stripdata = newdataadr(
-						fd, seq->strip->stripdata);
+				if (ELEM4(seq->type, SEQ_IMAGE, SEQ_MOVIE, SEQ_RAM_SOUND, SEQ_HD_SOUND)) {
+					seq->strip->stripdata = newdataadr(fd, seq->strip->stripdata);
 				}
 				else {
 					seq->strip->stripdata = NULL;
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 4cf17b2c24c..c028c374cce 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -2331,7 +2331,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
 		}
 
 		/* redraws flag in SpaceTime has been moved to Screen level */
-		for (sc  = main->screen.first; sc; sc = sc->id.next) {
+		for (sc = main->screen.first; sc; sc = sc->id.next) {
 			if (sc->redraws_flag == 0) {
 				/* just initialize to default? */
 				// XXX: we could also have iterated through areas, and taken them from the first timeline available...
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 799dc82482d..7b314c31488 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -884,9 +884,9 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 
 		/* let faces have default add factor of 0.0 */
 		while (ma) {
-		  if (!(ma->mode & MA_HALO))
-			  ma->add = 0.0;
-		  ma = ma->id.next;
+			if (!(ma->mode & MA_HALO))
+				ma->add = 0.0;
+			ma = ma->id.next;
 		}
 
 		while (ob) {
@@ -3606,7 +3606,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 				/* check if top parent has compound shape set and if yes, set this object
 				 * to compound shaper as well (was the behavior before, now it's optional) */
 				Object *parent = blo_do_versions_newlibadr(fd, lib, ob->parent);
-				while (parent && parent != ob &&  parent->parent != NULL) {
+				while (parent && parent != ob && parent->parent != NULL) {
 					parent = blo_do_versions_newlibadr(fd, lib, parent->parent);
 				}
 				if (parent) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 02ebc91f191..297eb6027ae 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -779,7 +779,7 @@ static void write_renderinfo(WriteData *wd, Main *mainvar)		/* for renderdeamon
 	current_screen_compat(mainvar, &curscreen);
 
 	for (sce= mainvar->scene.first; sce; sce= sce->id.next) {
-		if (sce->id.lib==NULL  && ( sce==curscreen->scene || (sce->r.scemode & R_BG_RENDER)) ) {
+		if (sce->id.lib == NULL && (sce == curscreen->scene || (sce->r.scemode & R_BG_RENDER))) {
 			data.sfra = sce->r.sfra;
 			data.efra = sce->r.efra;
 			memset(data.scene_name, 0, sizeof(data.scene_name));
-- 
cgit v1.2.3