From c0bd076bfd27fab3f2d468c85206b59d1c7ab29e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 17 May 2012 23:12:15 +0000 Subject: style cleanup: and add missing files to cmake --- source/blender/blenkernel/CMakeLists.txt | 1 + .../blender/blenloader/intern/versioning_legacy.c | 2 +- source/blender/bmesh/operators/bmo_create.c | 4 ++-- source/blender/compositor/CMakeLists.txt | 1 + source/blender/compositor/nodes/COM_TimeNode.cpp | 2 +- source/blender/python/intern/bpy_rna.c | 2 +- source/blender/render/intern/source/zbuf.c | 28 +++++++++++----------- 7 files changed, 21 insertions(+), 19 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index c2a83b5c048..a791d6f269f 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -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 diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 2f7ff055b91..799dc82482d 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -3559,7 +3559,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) { SpaceNla *snla = (SpaceNla *)sl; snla->autosnap = SACTSNAP_FRAME; - } + } break; } } diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index 7ef6068247d..ebdff8bf7aa 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -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, diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 6c26c481977..3230c0ec33d 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -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 diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp index 11bc29679b9..b3ce27a3829 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cpp +++ b/source/blender/compositor/nodes/COM_TimeNode.cpp @@ -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); } diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index f20e029c7b6..e9b6f15033c 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -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); diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 78e0810fb77..cfbdf04d75a 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -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]; } /* ------------------------------------------------------------------------- */ -- cgit v1.2.3