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

Campbell Barton ideasman42 at gmail.com
Thu Sep 20 14:29:29 CEST 2012


Revision: 50778
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50778
Author:   campbellbarton
Date:     2012-09-20 12:29:28 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/intern/audaspace/intern/AUD_IFactory.h
    trunk/blender/intern/audaspace/intern/AUD_IReader.h
    trunk/blender/intern/audaspace/intern/AUD_IWriter.h
    trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
    trunk/blender/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
    trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl
    trunk/blender/intern/cycles/kernel/svm/bsdf.h
    trunk/blender/intern/cycles/kernel/svm/bsdf_diffuse.h
    trunk/blender/intern/cycles/kernel/svm/bsdf_microfacet.h
    trunk/blender/intern/cycles/kernel/svm/bsdf_ward.h
    trunk/blender/intern/cycles/kernel/svm/bsdf_westin.h
    trunk/blender/intern/cycles/kernel/svm/svm_hsv.h
    trunk/blender/intern/cycles/kernel/svm/svm_noise.h
    trunk/blender/intern/cycles/render/camera.cpp
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    trunk/blender/intern/guardedalloc/test/simpletest/memtest.c
    trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
    trunk/blender/source/blender/gpu/intern/gpu_draw.c

Modified: trunk/blender/intern/audaspace/intern/AUD_IFactory.h
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_IFactory.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/audaspace/intern/AUD_IFactory.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -45,7 +45,7 @@
 	/**
 	 * Destroys the factory.
 	 */
-	virtual ~AUD_IFactory(){}
+	virtual ~AUD_IFactory() {}
 
 	/**
 	 * Creates a reader for playback of the sound source.

Modified: trunk/blender/intern/audaspace/intern/AUD_IReader.h
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_IReader.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/audaspace/intern/AUD_IReader.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -42,7 +42,7 @@
 	/**
 	 * Destroys the reader.
 	 */
-	virtual ~AUD_IReader(){}
+	virtual ~AUD_IReader() {}
 
 	/**
 	 * Tells whether the source provides seeking functionality or not.

Modified: trunk/blender/intern/audaspace/intern/AUD_IWriter.h
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_IWriter.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/audaspace/intern/AUD_IWriter.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -41,7 +41,7 @@
 	/**
 	 * Destroys the writer.
 	 */
-	virtual ~AUD_IWriter(){}
+	virtual ~AUD_IWriter() {}
 
 	/**
 	 * Returns how many samples have been written so far.

Modified: trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_montecarlo.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/kernel_montecarlo.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -46,16 +46,19 @@
 	if(a > -b) {
 		if(a > b) {
 			r = a;
-			 phi = M_PI_4_F *(b/a);
-		 } else {
-			 r = b;
-			 phi = M_PI_4_F *(2.0f - a/b);
-		 }
-	} else {
+			phi = M_PI_4_F *(b/a);
+		}
+		else {
+			r = b;
+			phi = M_PI_4_F *(2.0f - a/b);
+		}
+	}
+	else {
 		if(a < b) {
 			r = -a;
 			phi = M_PI_4_F *(4.0f + b/a);
-		} else {
+		}
+		else {
 			r = -b;
 			if(b != 0.0f)
 				phi = M_PI_4_F *(6.0f - a/b);

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_magic_texture.osl	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_magic_texture.osl	2012-09-20 12:29:28 UTC (rev 50778)
@@ -37,39 +37,39 @@
 		y *= dist;
 
 		if(n > 1) {
-			x= cos(x-y-z);
+			x = cos(x-y-z);
 			x *= dist;
 
 			if(n > 2) {
-				z= sin(-x-y-z);
+				z = sin(-x-y-z);
 				z *= dist;
 
 				if(n > 3) {
-					x= -cos(-x+y-z);
+					x = -cos(-x+y-z);
 					x *= dist;
 
 					if(n > 4) {
-						y= -sin(-x+y+z);
+						y = -sin(-x+y+z);
 						y *= dist;
 
 						if(n > 5) {
-							y= -cos(-x+y+z);
+							y = -cos(-x+y+z);
 							y *= dist;
 
 							if(n > 6) {
-								x= cos(x+y+z);
+								x = cos(x+y+z);
 								x *= dist;
 
 								if(n > 7) {
-									z= sin(x+y-z);
+									z = sin(x+y-z);
 									z *= dist;
 
 									if(n > 8) {
-										x= -cos(-x-y+z);
+										x = -cos(-x-y+z);
 										x *= dist;
 
 										if(n > 9) {
-											y= -sin(x-y+z);
+											y = -sin(x-y+z);
 											y *= dist;
 										}
 									}

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_mix.osl	2012-09-20 12:29:28 UTC (rev 50778)
@@ -239,8 +239,8 @@
 {
 	float tm = 1.0 - t;
 
-	color one= color(1.0);
-	color scr= one - (one - col2)*(one - col1);
+	color one = color(1.0);
+	color scr = one - (one - col2)*(one - col1);
 
 	return tm*col1 + t*((one - col1)*col2*col1 + col1*scr);
 }

Modified: trunk/blender/intern/cycles/kernel/svm/bsdf.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/bsdf.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/svm/bsdf.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -58,7 +58,8 @@
 		neta = 1 / eta;
 		Nn   = N;
 		*is_inside = false;
-	} else {
+	}
+	else {
 		// we are inside the surface, 
 		cos  = -cos;
 		neta = eta;
@@ -74,7 +75,8 @@
 		*dTdy = make_float3(0.0f, 0.0f, 0.0f);
 #endif
 		return 1; // total internal reflection
-	} else {
+	}
+	else {
 		float dnp = sqrtf(arg);
 		float nK = (neta * cos)- dnp;
 		*T = -(neta * I)+(nK * Nn);

Modified: trunk/blender/intern/cycles/kernel/svm/bsdf_diffuse.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/bsdf_diffuse.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/svm/bsdf_diffuse.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -144,9 +144,10 @@
 		*domega_in_dx *= -125.0f;
 		*domega_in_dy *= -125.0f;
 #endif
-	} else
+	}
+	else {
 		*pdf = 0;
-
+	}
 	return LABEL_TRANSMIT|LABEL_DIFFUSE;
 }
 

Modified: trunk/blender/intern/cycles/kernel/svm/bsdf_microfacet.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/bsdf_microfacet.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/svm/bsdf_microfacet.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -210,7 +210,8 @@
 #endif
 				}
 			}
-		} else {
+		}
+		else {
 			// CAUTION: the i and o variables are inverted relative to the paper
 			// eq. 39 - compute actual refractive direction
 			float3 R, T;
@@ -443,7 +444,8 @@
 #endif
 				}
 			}
-		} else {
+		}
+		else {
 			// CAUTION: the i and o variables are inverted relative to the paper
 			// eq. 39 - compute actual refractive direction
 			float3 R, T;

Modified: trunk/blender/intern/cycles/kernel/svm/bsdf_ward.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/bsdf_ward.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/svm/bsdf_ward.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -127,19 +127,22 @@
 			float tanPhi = alphaRatio * tanf(M_PI_2_F * val);
 			cosPhi = 1 / sqrtf(1 + tanPhi * tanPhi);
 			sinPhi = tanPhi * cosPhi;
-		} else if(randu < 0.5f) {
+		}
+		else if(randu < 0.5f) {
 			float val = 1 - 4 * (0.5f - randu);
 			float tanPhi = alphaRatio * tanf(M_PI_2_F * val);
 			// phi = M_PI_F - phi;
 			cosPhi = -1 / sqrtf(1 + tanPhi * tanPhi);
 			sinPhi = -tanPhi * cosPhi;
-		} else if(randu < 0.75f) {
+		}
+		else if(randu < 0.75f) {
 			float val = 4 * (randu - 0.5f);
 			float tanPhi = alphaRatio * tanf(M_PI_2_F * val);
 			//phi = M_PI_F + phi;
 			cosPhi = -1 / sqrtf(1 + tanPhi * tanPhi);
 			sinPhi = tanPhi * cosPhi;
-		} else {
+		}
+		else {
 			float val = 1 - 4 * (1 - randu);
 			float tanPhi = alphaRatio * tanf(M_PI_2_F * val);
 			// phi = 2 * M_PI_F - phi;

Modified: trunk/blender/intern/cycles/kernel/svm/bsdf_westin.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/bsdf_westin.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/svm/bsdf_westin.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -196,8 +196,10 @@
 		*domega_in_dx *= 125.0f;
 		*domega_in_dy *= 125.0f;
 #endif
-	} else
+	}
+	else {
 		pdf = 0;
+	}
 	return LABEL_REFLECT|LABEL_DIFFUSE;
 }
 

Modified: trunk/blender/intern/cycles/kernel/svm/svm_hsv.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_hsv.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/svm/svm_hsv.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -69,11 +69,11 @@
 	s = hsv.y;
 	v = hsv.z;
 
-	if(s==0.0f) {
+	if(s == 0.0f) {
 		rgb = make_float3(v, v, v);
 	}
 	else {
-		if(h==1.0f)
+		if(h == 1.0f)
 			h = 0.0f;
 		
 		h *= 6.0f;

Modified: trunk/blender/intern/cycles/kernel/svm/svm_noise.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_noise.h	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/kernel/svm/svm_noise.h	2012-09-20 12:29:28 UTC (rev 50778)
@@ -104,7 +104,7 @@
 	// use vectors pointing to the edges of the cube
 	int h = hash & 15;
 	float u = h<8 ? x : y;
-	float v = h<4 ? y : h==12||h==14 ? x : z;
+	float v = h<4 ? y : h == 12 || h == 14 ? x : z;
 	return ((h&1) ? -u : u) + ((h&2) ? -v : v);
 }
 

Modified: trunk/blender/intern/cycles/render/camera.cpp
===================================================================
--- trunk/blender/intern/cycles/render/camera.cpp	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/cycles/render/camera.cpp	2012-09-20 12:29:28 UTC (rev 50778)
@@ -245,7 +245,7 @@
 
 bool Camera::modified(const Camera& cam)
 {
-	return !((shuttertime== cam.shuttertime) &&
+	return !((shuttertime == cam.shuttertime) &&
 		(aperturesize == cam.aperturesize) &&
 		(blades == cam.blades) &&
 		(bladesrotation == cam.bladesrotation) &&

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-09-20 12:29:28 UTC (rev 50778)
@@ -459,7 +459,8 @@
 		strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1);
 		buf[FIRSTFILEBUFLG - 1] = '\0';
 		return 1;
-	} else {
+	}
+	else {
 		return 0; 
 	}
 }

Modified: trunk/blender/intern/guardedalloc/test/simpletest/memtest.c
===================================================================
--- trunk/blender/intern/guardedalloc/test/simpletest/memtest.c	2012-09-20 12:16:00 UTC (rev 50777)
+++ trunk/blender/intern/guardedalloc/test/simpletest/memtest.c	2012-09-20 12:29:28 UTC (rev 50778)
@@ -94,7 +94,8 @@
 	if (verbose) {
 		if (error_status) {
 			fprintf(stderr, "|--* Memory test FAILED\n|\n");
-		} else {
+		}
+		else {
 			fprintf(stderr, "|--* Memory tested as good (as it should be)\n|\n");
 		}
 	} 
@@ -130,7 +131,8 @@
 	if (verbose) {
 		if (retval) {
 			fprintf(stderr, "|--* Memory test failed (as it should be)\n");
-		} else {
+		}
+		else {
 			fprintf(stderr, "|--* Memory test FAILED to find corrupted blocks \n");
 		}
 	} 
@@ -147,7 +149,8 @@
 	if (verbose) {
 		if (error_status) {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list