[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51764] trunk/blender/source/blender: style cleanup

[Campbell Barton]

Revision: 51764
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51764
Author:   campbellbarton
Date:     2012-10-30 12:18:45 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/gpu/intern/gpu_draw.c
    trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.cpp
    trunk/blender/source/blender/quicktime/apple/qtkit_import.m
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2012-10-30 12:08:44 UTC (rev 51763)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2012-10-30 12:18:45 UTC (rev 51764)
@@ -130,9 +130,9 @@
 	const TransData *td_A = (const TransData*)A;
 	const TransData *td_B = (const TransData*)B;
 
-	if(td_A->dist < td_B->dist)
+	if (td_A->dist < td_B->dist)
 		return -1;
-	else if(td_A->dist > td_B->dist)
+	else if (td_A->dist > td_B->dist)
 		return 1;
 	
 	return 0;
@@ -143,9 +143,9 @@
 	const TransData *td_A = (const TransData*)A;
 	const TransData *td_B = (const TransData*)B;
 
-	if(td_A->rdist < td_B->rdist)
+	if (td_A->rdist < td_B->rdist)
 		return -1;
-	else if(td_A->rdist > td_B->rdist)
+	else if (td_A->rdist > td_B->rdist)
 		return 1;
 	
 	return 0;

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2012-10-30 12:08:44 UTC (rev 51763)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2012-10-30 12:18:45 UTC (rev 51764)
@@ -620,7 +620,7 @@
 		GPU_create_gl_tex(bind, rect, frect, rectw, recth, mipmap, use_high_bit_depth, ima);
 	
 	/* mark as non-color data texture */
-	if(*bind) {
+	if (*bind) {
 		if (is_data)
 			ima->tpageflag |= IMA_GLBIND_IS_DATA;	
 		else
@@ -739,7 +739,7 @@
 		return FALSE;
 	}
 
-	if(!is_power_of_2_i(width) || !is_power_of_2_i(height)) {
+	if (!is_power_of_2_i(width) || !is_power_of_2_i(height)) {
 		printf("Unable to load non-power-of-two DXT image resolution, falling back to uncompressed\n");
 		return FALSE;
 	}

Modified: trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.cpp	2012-10-30 12:08:44 UTC (rev 51763)
+++ trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.cpp	2012-10-30 12:18:45 UTC (rev 51764)
@@ -173,10 +173,10 @@
 int FlipDXTCImage(unsigned int width, unsigned int height, unsigned int levels, int fourcc, uint8_t *data)
 {
 	// must have valid dimensions
-	if(width == 0 || height == 0)
+	if (width == 0 || height == 0)
 		return 0;
 	// height must be a power-of-two
-	if((height & (height - 1)) != 0)
+	if ((height & (height - 1)) != 0)
 		return 0;
 
 	FlipBlockFunction full_block_function;

Modified: trunk/blender/source/blender/quicktime/apple/qtkit_import.m
===================================================================
--- trunk/blender/source/blender/quicktime/apple/qtkit_import.m	2012-10-30 12:08:44 UTC (rev 51763)
+++ trunk/blender/source/blender/quicktime/apple/qtkit_import.m	2012-10-30 12:18:45 UTC (rev 51764)
@@ -71,7 +71,7 @@
 
 void quicktime_exit(void)
 {
-	if(G.have_quicktime) {
+	if (G.have_quicktime) {
 		free_qtcomponentdata();
 	}
 }
@@ -82,27 +82,30 @@
 	NSAutoreleasePool *pool;
 	
 	// don't let quicktime movie import handle these
-	if( BLI_testextensie(name, ".swf") ||
-		BLI_testextensie(name, ".txt") ||
-		BLI_testextensie(name, ".mpg") ||
-		BLI_testextensie(name, ".avi") ||	// wouldn't be appropriate ;)
-		BLI_testextensie(name, ".mov") ||	// disabled, suboptimal decoding speed   
-		BLI_testextensie(name, ".mp4") ||	// disabled, suboptimal decoding speed
-		BLI_testextensie(name, ".m4v") ||	// disabled, suboptimal decoding speed
-		BLI_testextensie(name, ".tga") ||
-		BLI_testextensie(name, ".png") ||
-		BLI_testextensie(name, ".bmp") ||
-		BLI_testextensie(name, ".jpg") ||
-		BLI_testextensie(name, ".wav") ||
-		BLI_testextensie(name, ".zip") ||
-		BLI_testextensie(name, ".mp3")) return 0;
+	if (BLI_testextensie(name, ".swf") ||
+	    BLI_testextensie(name, ".txt") ||
+	    BLI_testextensie(name, ".mpg") ||
+	    BLI_testextensie(name, ".avi") ||	// wouldn't be appropriate ;)
+	    BLI_testextensie(name, ".mov") ||	// disabled, suboptimal decoding speed
+	    BLI_testextensie(name, ".mp4") ||	// disabled, suboptimal decoding speed
+	    BLI_testextensie(name, ".m4v") ||	// disabled, suboptimal decoding speed
+	    BLI_testextensie(name, ".tga") ||
+	    BLI_testextensie(name, ".png") ||
+	    BLI_testextensie(name, ".bmp") ||
+	    BLI_testextensie(name, ".jpg") ||
+	    BLI_testextensie(name, ".wav") ||
+	    BLI_testextensie(name, ".zip") ||
+	    BLI_testextensie(name, ".mp3"))
+	{
+		return 0;
+	}
 
-	if(QTIME_DEBUG) printf("qt: checking as movie: %s\n", name);
+	if (QTIME_DEBUG) printf("qt: checking as movie: %s\n", name);
 
 	pool = [[NSAutoreleasePool alloc] init];
 	
-	if([QTMovie canInitWithFile:[NSString stringWithCString:name 
-	                             encoding:[NSString defaultCStringEncoding]]])
+	if ([QTMovie canInitWithFile:[NSString stringWithCString:name
+	                              encoding:[NSString defaultCStringEncoding]]])
 	{
 		[pool drain];
 		return true;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2012-10-30 12:08:44 UTC (rev 51763)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2012-10-30 12:18:45 UTC (rev 51764)
@@ -1918,7 +1918,7 @@
 		else {
 			wmWindow *win = CTX_wm_window(C);
 
-			if(win)
+			if (win)
 				win->eventstate->check_click = 0;
 		}
 	}