[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46751] trunk/blender/source/blender: style cleanup: and add missing files to cmake

[Campbell Barton]

Revision: 46751
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46751
Author:   campbellbarton
Date:     2012-05-17 23:12:15 +0000 (Thu, 17 May 2012)
Log Message:
-----------
style cleanup: and add missing files to cmake

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/CMakeLists.txt
    trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
    trunk/blender/source/blender/bmesh/operators/bmo_create.c
    trunk/blender/source/blender/compositor/CMakeLists.txt
    trunk/blender/source/blender/compositor/nodes/COM_TimeNode.cpp
    trunk/blender/source/blender/python/intern/bpy_rna.c
    trunk/blender/source/blender/render/intern/source/zbuf.c

Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt	2012-05-17 22:55:28 UTC (rev 46750)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt	2012-05-17 23:12:15 UTC (rev 46751)
@@ -157,6 +157,7 @@
 	BKE_bullet.h
 	BKE_bvhutils.h
 	BKE_camera.h
+	BKE_ccg.h
 	BKE_cdderivedmesh.h
 	BKE_cloth.h
 	BKE_collision.h

Modified: trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_legacy.c	2012-05-17 22:55:28 UTC (rev 46750)
+++ trunk/blender/source/blender/blenloader/intern/versioning_legacy.c	2012-05-17 23:12:15 UTC (rev 46751)
@@ -3559,7 +3559,7 @@
 							{
 								SpaceNla *snla = (SpaceNla *)sl;
 								snla->autosnap = SACTSNAP_FRAME;
-		   					}
+							}
 							break;
 					}
 				}

Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c	2012-05-17 22:55:28 UTC (rev 46750)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c	2012-05-17 23:12:15 UTC (rev 46751)
@@ -83,8 +83,8 @@
 
 BLI_INLINE BMDiskLink *rs_edge_link_get(BMEdge *e, BMVert *v, EdgeData *e_data)
 {
-	return 	v == ((BMEdge *)e)->v1 ? &(((EdgeData *)e_data)->v1_disk_link) :
-	                                 &(((EdgeData *)e_data)->v2_disk_link) ;
+	return v == ((BMEdge *)e)->v1 ? &(((EdgeData *)e_data)->v1_disk_link) :
+	                                &(((EdgeData *)e_data)->v2_disk_link) ;
 }
 
 static int rotsys_append_edge(BMEdge *e, BMVert *v,

Modified: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/compositor/CMakeLists.txt	2012-05-17 22:55:28 UTC (rev 46750)
+++ trunk/blender/source/blender/compositor/CMakeLists.txt	2012-05-17 23:12:15 UTC (rev 46751)
@@ -65,6 +65,7 @@
 	intern/COM_NodeBase.h
 	intern/COM_NodeOperation.cpp
 	intern/COM_NodeOperation.h
+	intern/COM_NodeProgram.h
 	intern/COM_Socket.cpp
 	intern/COM_Socket.h
 	intern/COM_SocketReader.cpp

Modified: trunk/blender/source/blender/compositor/nodes/COM_TimeNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_TimeNode.cpp	2012-05-17 22:55:28 UTC (rev 46750)
+++ trunk/blender/source/blender/compositor/nodes/COM_TimeNode.cpp	2012-05-17 23:12:15 UTC (rev 46751)
@@ -49,7 +49,7 @@
 	else if (framenumber > node->custom2) {
 		fac = 1.0f;
 	}
-	else 	if (node->custom1 < node->custom2) {
+	else if (node->custom1 < node->custom2) {
 		fac = (context->getFramenumber() - node->custom1)/(float)(node->custom2-node->custom1);
 	}
 

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2012-05-17 22:55:28 UTC (rev 46750)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2012-05-17 23:12:15 UTC (rev 46751)
@@ -986,7 +986,7 @@
 			ret = PyUnicode_FromFormat("bpy.data.%s[%R].%s",
 			                           BKE_idcode_to_name_plural(GS(id->name)),
 			                           tmp_str,
-		    	                       path);
+			                           path);
 		}
 
 		MEM_freeN((void *)path);

Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c	2012-05-17 22:55:28 UTC (rev 46750)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c	2012-05-17 23:12:15 UTC (rev 46751)
@@ -1703,13 +1703,13 @@
 	/* calcs homogenic coord of vertex v1 */
 	float x, y, z;
 
-	x= v1[0]; 
-	y= v1[1]; 
-	z= v1[2];
-	adr[0]= x*winmat[0][0]				+	z*winmat[2][0] + winmat[3][0];
-	adr[1]= 		      y*winmat[1][1]	+	z*winmat[2][1] + winmat[3][1];
-	adr[2]=										z*winmat[2][2] + winmat[3][2];
-	adr[3]=										z*winmat[2][3] + winmat[3][3];
+	x = v1[0];
+	y = v1[1];
+	z = v1[2];
+	adr[0] = x * winmat[0][0] + z * winmat[2][0] + winmat[3][0];
+	adr[1] = y * winmat[1][1] + z * winmat[2][1] + winmat[3][1];
+	adr[2] =                    z * winmat[2][2] + winmat[3][2];
+	adr[3] =                    z * winmat[2][3] + winmat[3][3];
 
 	//printf("hoco %f %f %f %f\n", adr[0], adr[1], adr[2], adr[3]);
 }
@@ -1721,13 +1721,13 @@
 	/* calcs homogenic coord of vertex v1 */
 	float x, y, z;
 
-	x= v1[0]; 
-	y= v1[1]; 
-	z= v1[2];
-	adr[0]= x*winmat[0][0]+ y*winmat[1][0]+ z*winmat[2][0]+ winmat[3][0];
-	adr[1]= x*winmat[0][1]+ y*winmat[1][1]+ z*winmat[2][1]+ winmat[3][1];
-	adr[2]= x*winmat[0][2]+ y*winmat[1][2]+ z*winmat[2][2]+ winmat[3][2];
-	adr[3]= x*winmat[0][3]+ y*winmat[1][3]+ z*winmat[2][3]+ winmat[3][3];
+	x = v1[0];
+	y = v1[1];
+	z = v1[2];
+	adr[0] = x * winmat[0][0] + y * winmat[1][0] + z * winmat[2][0] + winmat[3][0];
+	adr[1] = x * winmat[0][1] + y * winmat[1][1] + z * winmat[2][1] + winmat[3][1];
+	adr[2] = x * winmat[0][2] + y * winmat[1][2] + z * winmat[2][2] + winmat[3][2];
+	adr[3] = x * winmat[0][3] + y * winmat[1][3] + z * winmat[2][3] + winmat[3][3];
 }
 
 /* ------------------------------------------------------------------------- */