Revision: 44431
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44431
Author: campbellbarton
Date: 2012-02-25 16:04:03 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
code cleanup: white space, spelling & ';;' end of lines.
Modified Paths:
--------------
trunk/blender/build_files/cmake/Modules/FindGLEW.cmake
trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
trunk/blender/intern/boolop/intern/BOP_BSPNode.cpp
trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp
trunk/blender/intern/boolop/intern/BOP_Merge2.h
trunk/blender/intern/boolop/intern/BOP_Mesh.cpp
trunk/blender/intern/boolop/intern/BOP_Mesh.h
trunk/blender/intern/bsp/intern/BSP_MeshPrimitives.h
trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
trunk/blender/intern/cycles/device/device_network.h
trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h
trunk/blender/intern/cycles/kernel/osl/osl_services.h
trunk/blender/intern/cycles/kernel/svm/svm_texture.h
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/bmesh/bmesh_operator_api.h
trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
trunk/blender/source/blender/editors/mesh/bmesh_select.c
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/knifetool.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/python/mathutils/mathutils_noise.c
Modified: trunk/blender/build_files/cmake/Modules/FindGLEW.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindGLEW.cmake 2012-02-25
15:51:39 UTC (rev 44430)
+++ trunk/blender/build_files/cmake/Modules/FindGLEW.cmake 2012-02-25
16:04:03 UTC (rev 44431)
@@ -18,7 +18,7 @@
PATHS
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
+ ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library (64-bit)"
)
ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
@@ -27,7 +27,7 @@
PATHS
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
+ ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library"
)
ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
Modified:
trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
===================================================================
--- trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
2012-02-25 15:51:39 UTC (rev 44430)
+++ trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
2012-02-25 16:04:03 UTC (rev 44431)
@@ -70,7 +70,7 @@
const float cp = vcross2(p1, p2, p3);
if (fabsf(cp) > EPS)
- {
+ {
const float p1Sq = vdot2(p1,p1);
const float p2Sq = vdot2(p2,p2);
const float p3Sq = vdot2(p3,p3);
@@ -78,7 +78,7 @@
c[2] = (p1Sq*(p3[0]-p2[0]) + p2Sq*(p1[0]-p3[0]) +
p3Sq*(p2[0]-p1[0])) / (2*cp);
r = vdist2(c, p1);
return true;
- }
+ }
c[0] = p1[0];
c[2] = p1[2];
Modified: trunk/blender/intern/boolop/intern/BOP_BSPNode.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_BSPNode.cpp 2012-02-25 15:51:39 UTC
(rev 44430)
+++ trunk/blender/intern/boolop/intern/BOP_BSPNode.cpp 2012-02-25 16:04:03 UTC
(rev 44431)
@@ -89,10 +89,10 @@
else {
m_outChild = new BOP_BSPNode(plane);
newDeep = 2;
- }
+ }
} else { // face lies in both half-spaces: split it
BOP_BSPPoints inside, outside;
- MT_Point3 lpoint= pts[pts.size()-1];
+ MT_Point3 lpoint= pts[pts.size()-1];
BOP_TAG ltag = testPoint(lpoint);
BOP_TAG tstate = ltag;
Modified: trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp 2012-02-25
15:51:39 UTC (rev 44430)
+++ trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp 2012-02-25
16:04:03 UTC (rev 44431)
@@ -538,10 +538,10 @@
for(i=0;i<size;i++) {
if (position[i] == 1) {
invertA = true;
- break;
- }
- else if (position[i] == 0) break;
- }
+ break;
+ }
+ else if (position[i] == 0) break;
+ }
// invertBø?
if (size == 4) {
@@ -597,7 +597,7 @@
sortedFaces[i] =
sortedFaces[i+1];
}
size--;
- }
+ }
}
else {
// merge 0 and 1
@@ -616,7 +616,7 @@
size--;
}
}
- }
+ }
}
else {
if (BOP_fuzzyZero(d2) && sortedFaces[1] !=
sortedFaces[2]) {
@@ -637,14 +637,14 @@
}
}
}
-
+
// Merge initial points ...
for(i=0;i<size;i++) {
points[i] = sortedPoints[i];
face[i] = sortedFaces[i];
}
- }
+ }
}
@@ -1058,17 +1058,17 @@
else {
// EDGE(v1) + EDGE(v2)
if (BOP_Segment::getEdge(s.m_cfg1) ==
BOP_Segment::getEdge(s.m_cfg2)) {
- // EDGE(v1) == EDGE(v2)
+ // EDGE(v1) == EDGE(v2)
BOP_Edge *edge =
mesh->getEdge(face,BOP_Segment::getEdge(s.m_cfg1));
- BOP_triangulateD(mesh, faces, face, s.m_v1,
s.m_v2,
-
BOP_Segment::getEdge(s.m_cfg1));
+ BOP_triangulateD(mesh, faces, face, s.m_v1,
s.m_v2,
+
BOP_Segment::getEdge(s.m_cfg1));
BOP_Face *opposite =
BOP_getOppositeFace(mesh,faces,face,edge);
if (opposite != NULL) {
- unsigned int e;
- opposite->getEdgeIndex(edge->getVertex1(),
edge->getVertex2(),e);
- BOP_triangulateD(mesh, faces, opposite,
s.m_v1, s.m_v2, e);
+ unsigned int e;
+
opposite->getEdgeIndex(edge->getVertex1(), edge->getVertex2(),e);
+ BOP_triangulateD(mesh, faces, opposite,
s.m_v1, s.m_v2, e);
}
- }
+ }
else { // EDGE(v1) != EDGE(v2)
BOP_Edge *edge1 =
mesh->getEdge(face,BOP_Segment::getEdge(s.m_cfg1));
BOP_Edge *edge2 =
mesh->getEdge(face,BOP_Segment::getEdge(s.m_cfg2));
Modified: trunk/blender/intern/boolop/intern/BOP_Merge2.h
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Merge2.h 2012-02-25 15:51:39 UTC
(rev 44430)
+++ trunk/blender/intern/boolop/intern/BOP_Merge2.h 2012-02-25 16:04:03 UTC
(rev 44431)
@@ -78,7 +78,7 @@
BOP_Index X, BOP_Index I, BOP_Index P,
BOP_Index N );
BOP_Face *find4Neighbor(BOP_Face *faceI, BOP_Face *faceJ,
BOP_Index X, BOP_Index I, BOP_Index P,
BOP_Index N,
- BOP_Face **faceL, BOP_Index &O);
+ BOP_Face **faceL, BOP_Index &O);
BOP_Face3 *collapse(BOP_Face4 *faceC, BOP_Index X);
void mergeFaces(BOP_Face *A, BOP_Face *B, BOP_Index X,
BOP_Index I, BOP_Index N, BOP_Index P, BOP_Faces
&newFaces );
Modified: trunk/blender/intern/boolop/intern/BOP_Mesh.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Mesh.cpp 2012-02-25 15:51:39 UTC
(rev 44430)
+++ trunk/blender/intern/boolop/intern/BOP_Mesh.cpp 2012-02-25 16:04:03 UTC
(rev 44431)
@@ -252,8 +252,8 @@
BOP_Index index2 = face->getVertex(1);
BOP_Index index3 = face->getVertex(2);
- m_faces.push_back((BOP_Face *)face);
-
+ m_faces.push_back((BOP_Face *)face);
+
BOP_Index edge;
if (!getIndexEdge(index1,index2,edge)) {
@@ -261,7 +261,7 @@
getVertex(index1)->addEdge(edge);
getVertex(index2)->addEdge(edge);
}
-
+
getEdge(edge)->addFace(indexface);
if (!getIndexEdge(index2,index3,edge)) {
@@ -269,7 +269,7 @@
getVertex(index2)->addEdge(edge);
getVertex(index3)->addEdge(edge);
}
-
+
getEdge(edge)->addFace(indexface);
if (!getIndexEdge(index3,index1,edge)) {
@@ -277,13 +277,13 @@
getVertex(index3)->addEdge(edge);
getVertex(index1)->addEdge(edge);
}
-
+
getEdge(edge)->addFace(indexface);
if ((index1 == index2) || (index1 == index3) || (index2 == index3))
face->setTAG(BROKEN);
- return indexface;
+ return indexface;
}
/**
@@ -452,7 +452,7 @@
#ifdef HASH_PRINTF_DEBUG
printf ("found edge (%d %d)\n",v1,v2);
#endif
- e = edge->index;
+ e = edge->index;
#ifdef BOP_NEW_MERGE
if( m_edges[e]->getUsed() == false ) {
m_edges[e]->setUsed(true);
Modified: trunk/blender/intern/boolop/intern/BOP_Mesh.h
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Mesh.h 2012-02-25 15:51:39 UTC
(rev 44430)
+++ trunk/blender/intern/boolop/intern/BOP_Mesh.h 2012-02-25 16:04:03 UTC
(rev 44431)
@@ -100,7 +100,7 @@
BOP_Index replaceVertexIndex(BOP_Index oldIndex, BOP_Index newIndex);
#ifdef HASH
void rehashVertex(BOP_Index oldIndex, BOP_Index newIndex,
- BOP_Index otherIndex);
+ BOP_Index otherIndex);
#endif
bool isClosedMesh();
Modified: trunk/blender/intern/bsp/intern/BSP_MeshPrimitives.h
===================================================================
--- trunk/blender/intern/bsp/intern/BSP_MeshPrimitives.h 2012-02-25
15:51:39 UTC (rev 44430)
+++ trunk/blender/intern/bsp/intern/BSP_MeshPrimitives.h 2012-02-25
16:04:03 UTC (rev 44431)
@@ -189,7 +189,7 @@
BSP_FaceInd new_f
);
- BSP_VertexInd
+ BSP_VertexInd
OpVertex(
BSP_VertexInd vi
) const;
Modified: trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
===================================================================
--- trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h 2012-02-25
15:51:39 UTC (rev 44430)
+++ trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h 2012-02-25
16:04:03 UTC (rev 44431)
@@ -84,9 +84,9 @@
f.m_verts[1] = verts[i-1];
f.m_verts[2] = verts[i];
- m_faces.push_back(f);
+ m_faces.push_back(f);
- BuildNormal(m_faces.back());
+ BuildNormal(m_faces.back());
}
}
Modified: trunk/blender/intern/cycles/device/device_network.h
===================================================================
--- trunk/blender/intern/cycles/device/device_network.h 2012-02-25 15:51:39 UTC
(rev 44430)
+++ trunk/blender/intern/cycles/device/device_network.h 2012-02-25 16:04:03 UTC
(rev 44431)
@@ -109,7 +109,7 @@
: socket(socket_), archive_stream(NULL), archive(NULL)
{
/* read head with fixed size */
- vector<char> header(8);
+ vector<char> header(8);
size_t len = boost::asio::read(socket,
boost::asio::buffer(header));
/* verify if we got something */
@@ -170,7 +170,7 @@
: listen_socket(io_service), collect_servers(false)
{
/* setup listen socket */
- listen_endpoint.address(boost::asio::ip::address_v4::any());
+ listen_endpoint.address(boost::asio::ip::address_v4::any());
listen_endpoint.port(DISCOVER_PORT);
listen_socket.open(listen_endpoint.protocol());
@@ -178,7 +178,7 @@
boost::asio::socket_base::reuse_address option(true);
listen_socket.set_option(option);
- listen_socket.bind(listen_endpoint);
+ listen_socket.bind(listen_endpoint);
/* setup receive callback */
async_receive();
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h 2012-02-25
15:51:39 UTC (rev 44430)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h 2012-02-25
16:04:03 UTC (rev 44431)
@@ -190,7 +190,7 @@
float result = 0.0;
if(wave == "Sine") {
- result = 0.5 + 0.5*sin(a);
+ result = 0.5 + 0.5*sin(a);
}
else if(wave == "Saw") {
float b = 2*M_PI;
Modified: trunk/blender/intern/cycles/kernel/osl/osl_services.h
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_services.h 2012-02-25
15:51:39 UTC (rev 44430)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.h 2012-02-25
16:04:03 UTC (rev 44431)
@@ -66,7 +66,7 @@
void *renderstate, void *val);
bool has_userdata(ustring name, TypeDesc type, void *renderstate);
- void *get_pointcloud_attr_query(ustring *attr_names,
+ void *get_pointcloud_attr_query(ustring *attr_names,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
