style cleanup: and add missing files to cmake
authorCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2012 23:12:15 +0000 (23:12 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2012 23:12:15 +0000 (23:12 +0000)
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/versioning_legacy.c
source/blender/bmesh/operators/bmo_create.c
source/blender/compositor/CMakeLists.txt
source/blender/compositor/nodes/COM_TimeNode.cpp
source/blender/python/intern/bpy_rna.c
source/blender/render/intern/source/zbuf.c

index c2a83b5c0480f312549be21e80cfd089ece94b1e..a791d6f269fe4010928972c91f0c199c5ad2d82c 100644 (file)
@@ -157,6 +157,7 @@ set(SRC
        BKE_bullet.h
        BKE_bvhutils.h
        BKE_camera.h
+       BKE_ccg.h
        BKE_cdderivedmesh.h
        BKE_cloth.h
        BKE_collision.h
index 2f7ff055b912f42263a57bbfaffa49605d201799..799dc82482d6c7b9d57a51a65399e22d4618e83d 100644 (file)
@@ -3559,7 +3559,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
                                                        {
                                                                SpaceNla *snla = (SpaceNla *)sl;
                                                                snla->autosnap = SACTSNAP_FRAME;
-                                                       }
+                                                       }
                                                        break;
                                        }
                                }
index 7ef6068247d2d8c057ef62d8eb72a1292e811381..ebdff8bf7aac08982edd08c02035d51fc8b89102 100644 (file)
@@ -83,8 +83,8 @@ static int count_edge_faces(BMesh *bm, BMEdge *e);
 
 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,
index 6c26c481977bd020b96032f8f86b9a25fb5c72bf..3230c0ec33db920c216323282de6a0a46a88e5fa 100644 (file)
@@ -65,6 +65,7 @@ set(SRC
        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
index 11bc29679b98c5acb5793c901e204fa515112874..b3ce27a382912be6849efcc5426e2b92d0bda258 100644 (file)
@@ -49,7 +49,7 @@ void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c
        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);
        }
 
index f20e029c7b6832bf0c0341d976dcea32b187da0b..e9b6f15033cd582f6a1bf079d18e798dd2987952 100644 (file)
@@ -986,7 +986,7 @@ static PyObject *pyrna_prop_repr(BPy_PropertyRNA *self)
                        ret = PyUnicode_FromFormat("bpy.data.%s[%R].%s",
                                                   BKE_idcode_to_name_plural(GS(id->name)),
                                                   tmp_str,
-                                              path);
+                                                  path);
                }
 
                MEM_freeN((void *)path);
index 78e0810fb7708119ba2aa482c77264bd41506f6e..cfbdf04d75a1a0638dc575da9e84ab0be55ce176 100644 (file)
@@ -1703,13 +1703,13 @@ void projectverto(const float v1[3], float winmat[][4], float adr[4])
        /* 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 @@ void projectvert(const float v1[3], float winmat[][4], float adr[4])
        /* 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];
 }
 
 /* ------------------------------------------------------------------------- */