archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup: and add missing files to cmake

Browse Source
This commit is contained in:
Campbell Barton
2012-05-17 23:12:15 +00:00
parent 7862b2fa13
commit c0bd076bfd
7 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/CMakeLists.txt
View 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

2
source/blender/blenloader/intern/versioning_legacy.c
View 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;
}
}

4
source/blender/bmesh/operators/bmo_create.c
View 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,

1
source/blender/compositor/CMakeLists.txt
View 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

2
source/blender/compositor/nodes/COM_TimeNode.cpp
View 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);
}

2
source/blender/python/intern/bpy_rna.c
View 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);

28
source/blender/render/intern/source/zbuf.c
View 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];
}
/* ------------------------------------------------------------------------- */