code cleanup: white space, spelling & ';;' end of lines.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 25 Feb 2012 16:04:03 +0000 (16:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 25 Feb 2012 16:04:03 +0000 (16:04 +0000)
32 files changed:
build_files/cmake/Modules/FindGLEW.cmake
extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
intern/boolop/intern/BOP_BSPNode.cpp
intern/boolop/intern/BOP_Face2Face.cpp
intern/boolop/intern/BOP_Merge2.h
intern/boolop/intern/BOP_Mesh.cpp
intern/boolop/intern/BOP_Mesh.h
intern/bsp/intern/BSP_MeshPrimitives.h
intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
intern/cycles/device/device_network.h
intern/cycles/kernel/osl/nodes/node_texture.h
intern/cycles/kernel/osl/osl_services.h
intern/cycles/kernel/svm/svm_texture.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/idprop.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/movieclip.c
source/blender/bmesh/bmesh_operator_api.h
source/blender/bmesh/operators/bmo_join_triangles.c
source/blender/bmesh/operators/bmo_mesh_conv.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/knifetool.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_edit.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/makesdna/DNA_object_types.h
source/blender/python/mathutils/mathutils_noise.c

index 7e1b00d09237ef9607e31901d1abeb80c6f61025..3f7cca333cc84e5eb982abba6c65c18698f9a419 100644 (file)
@@ -18,7 +18,7 @@ IF (WIN32)
                        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 @@ IF (WIN32)
                        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")
index 126529e9779779a26510e8c984054d089e7468d5..3922c864eba33e9508191d009a09677141601c37 100644 (file)
@@ -70,7 +70,7 @@ static bool circumCircle(const float* p1, const float* p2, const float* p3,
        
        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 @@ static bool circumCircle(const float* p1, const float* p2, const float* p3,
                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];
index 7d9071b31325fa4e651d8bea227731ec8d5b7b62..3588e80c28e102b2358b6054b9d00e0cdb0f9511 100644 (file)
@@ -89,10 +89,10 @@ unsigned int BOP_BSPNode::addFace(const BOP_BSPPoints& pts,
                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;
 
index de9fa7b85086da76c7997e7412fbfda098ed4056..f88a271bfdbfa72836e26be947af4d3323226a02 100644 (file)
@@ -538,10 +538,10 @@ void BOP_mergeSort(MT_Point3 *points, unsigned int *face, unsigned int &size, bo
                        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 @@ void BOP_mergeSort(MT_Point3 *points, unsigned int *face, unsigned int &size, bo
                                                sortedFaces[i] = sortedFaces[i+1];
                                        }
                                        size--;
-                               }        
+                               }
                        }
                        else {
                                // merge 0 and 1
@@ -616,7 +616,7 @@ void BOP_mergeSort(MT_Point3 *points, unsigned int *face, unsigned int &size, bo
                                                size--;
                                        }
                                }
-                       }     
+                       }
                }
                else {
                        if (BOP_fuzzyZero(d2) && sortedFaces[1] != sortedFaces[2])  {
@@ -637,14 +637,14 @@ void BOP_mergeSort(MT_Point3 *points, unsigned int *face, unsigned int &size, bo
                                }
                        }
                }
-    
+
                // Merge initial points ...
                for(i=0;i<size;i++) {
                        points[i] = sortedPoints[i];
                        face[i] = sortedFaces[i];
                }
 
-       }
+       }
 }
 
 
@@ -1058,17 +1058,17 @@ void triangulate(BOP_Mesh *mesh, BOP_Faces *faces, BOP_Face *face, BOP_Segment s
                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));
index 1e26a2576be04f6038538333bbc1e2b3f0e4fd6d..71ec0702a0b1a85f2688cb770f094525529392f5 100644 (file)
@@ -78,7 +78,7 @@ class BOP_Merge2 {
                                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 );
index e35b5437f68a169bd8e3f5789c25e6e5e8abceb0..673caa3e921280daedd2d00c705120c427b70bb2 100644 (file)
@@ -252,8 +252,8 @@ BOP_Index BOP_Mesh::addFace(BOP_Face3 *face)
        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 @@ BOP_Index BOP_Mesh::addFace(BOP_Face3 *face)
                getVertex(index1)->addEdge(edge);
                getVertex(index2)->addEdge(edge);
        }
-               
+
        getEdge(edge)->addFace(indexface);
        
        if (!getIndexEdge(index2,index3,edge)) {
@@ -269,7 +269,7 @@ BOP_Index BOP_Mesh::addFace(BOP_Face3 *face)
                getVertex(index2)->addEdge(edge);
                getVertex(index3)->addEdge(edge);
        }
-    
+
        getEdge(edge)->addFace(indexface);
 
        if (!getIndexEdge(index3,index1,edge)) {
@@ -277,13 +277,13 @@ BOP_Index BOP_Mesh::addFace(BOP_Face3 *face)
                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 @@ bool BOP_Mesh::getIndexEdge(BOP_Index v1, BOP_Index v2, BOP_Index &e)
 #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);
index 381557ec58b3be58d650a97d99fe80fb57a41843..9c1b4ad04ea5fd397c87f00f5212b7181378308c 100644 (file)
@@ -100,7 +100,7 @@ public:
        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();
 
index 018677327f49c6bebcc78bec9cb87d337a39013a..f4d04d8863e5f4acd0871786599772b51b76a005 100644 (file)
@@ -189,7 +189,7 @@ public :
                BSP_FaceInd new_f
        );
 
-       BSP_VertexInd
+               BSP_VertexInd
        OpVertex(
                BSP_VertexInd vi
        ) const;
index ca4ab1066648926279aea9b67699b9dedb1e74b4..793fb47f73b19438aef82b748044e10a42e6728a 100644 (file)
@@ -84,9 +84,9 @@ public :
                        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());
                }
        }
 
index 3cdb70bb4dfccab6646996969ed857f1cefaa38a..591216a77b934a8a77563aa36a842cd27bcc3e48 100644 (file)
@@ -109,7 +109,7 @@ typedef struct RPCReceive {
        : 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 @@ public:
        : 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 @@ public:
                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();
index 8adb0e8aeb542fab466b9ec9dba9b5f68c65832a..e0ec8038ee456b63f7d3fd2bebe97a35039b5ee1 100644 (file)
@@ -190,7 +190,7 @@ float noise_wave(string wave, float a)
        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;
index e5003074822fd33d6094b953679e374dc9b80383..85a01e54e5c3f777c7fad78a703dc4f7b17131e6 100644 (file)
@@ -66,7 +66,7 @@ public:
                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,
                TypeDesc *attr_types, int nattrs);
        int pointcloud(ustring filename, const OSL::Vec3 &center, float radius,
                int max_points, void *attr_query, void **attr_outdata);
index 82797018d74375652050ff20cd7913b20f342ba9..448132bff469be0033622a094db0a99540bb1c39 100644 (file)
@@ -191,7 +191,7 @@ __device float noise_basis_hard(float3 p, NodeNoiseBasis basis, int hard)
 __device float noise_wave(NodeWaveType wave, float a)
 {
        if(wave == NODE_WAVE_SINE) {
-       return 0.5f + 0.5f*sin(a);
+               return 0.5f + 0.5f*sin(a);
        }
        else if(wave == NODE_WAVE_SAW) {
                float b = 2.0f*M_PI_F;
index c1d6165d37e21a5100cce45ed4b55912b4262a34..b61074d9a942b5b3ee46b0be05cf53f8ebf93293 100644 (file)
@@ -2081,7 +2081,7 @@ static DerivedMesh *cddm_copy_ex(DerivedMesh *source, int faces_from_tessfaces)
        
        if (!faces_from_tessfaces)
                DM_DupPolys(source, dm);
-       else
+       else
                CDDM_tessfaces_to_faces(dm);
 
        cddm->mloop = CustomData_get_layer(&dm->loopData, CD_MLOOP);
index d9fe0138784e334afef7de9cff3dfbcfcd158ddb..3bcb262fac86c0dec5f4abf36cfa920ad65ddf95 100644 (file)
@@ -146,7 +146,7 @@ void IDP_ResizeIDPArray(IDProperty *prop, int newlen)
                return;
        }
 
-       /* - Note: This code comes from python, here's the corrusponding comment. - */
+       /* - Note: This code comes from python, here's the corresponding comment. - */
        /* This over-allocates proportional to the list size, making room
         * for additional growth.  The over-allocation is mild, but is
         * enough to give linear-time amortized behavior over a long
@@ -220,7 +220,7 @@ void IDP_ResizeArray(IDProperty *prop, int newlen)
                return;
        }
 
-       /* - Note: This code comes from python, here's the corrusponding comment. - */
+       /* - Note: This code comes from python, here's the corresponding comment. - */
        /* This over-allocates proportional to the list size, making room
         * for additional growth.  The over-allocation is mild, but is
         * enough to give linear-time amortized behavior over a long
index 03d4ca0a922a89d728ec19c3022e04e471bc6b62..ab9f9aa580e0993e7b6233574355b35c52663ed4 100644 (file)
@@ -1706,8 +1706,9 @@ void mesh_calc_normals_mapping_ex(MVert *mverts, int numVerts,
                for (i=0; i<numFaces; i++, mf++, origIndexFace++) {
                        if (*origIndexFace < numPolys) {
                                copy_v3_v3(fnors[i], pnors[*origIndexFace]);
-                       } else {
-                               /*eek, we're not corrusponding to polys*/
+                       }
+                       else {
+                               /* eek, we're not corresponding to polys */
                                printf("error in mesh_calc_normals; tesselation face indices are incorrect.  normals may look bad.\n");
                        }
                }
index 69b32ce46f8b126cc31268d3ad11fd5678167afb..4d8f76467b1a87415c1bdadecfad695a5c153b37 100644 (file)
@@ -957,7 +957,7 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
 
                                        if(user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT) {
                                                int width, height;
-                                               float aspy= 1.0f/clip->tracking.camera.pixel_aspect;;
+                                               float aspy= 1.0f/clip->tracking.camera.pixel_aspect;
 
                                                BKE_movieclip_get_size(clip, user, &width, &height);
 
index 79c89392015b77695d94d5fbdff6e9e74c70aaac..b9c9bd529663473ee2131d8b79512db8ee5bdc4b 100644 (file)
@@ -225,7 +225,7 @@ int BMO_mesh_flag_count(struct BMesh *bm, const short oflag, const char htype);
  *    %e        - pass in a single element.
  *    %v - pointer to a float vector of length 3.
  *    %m[3/4] - matrix, 3/4 refers to the matrix size, 3 or 4.  the
- *              corrusponding argument must be a pointer to
+ *              corresponding argument must be a pointer to
  *          a float matrix.
  *    %s - copy a slot from another op, instead of mapping to one
  *         argument, it maps to two, a pointer to an operator and
index 3f102661d30acbbb84ffe28f5d4a1c796a206e7f..5ece4b60c4ee4b15f3441c7d48ef62d3a1ce2136 100644 (file)
@@ -125,7 +125,7 @@ static int compareFaceAttribs(BMesh *bm, BMEdge *e, int douvs, int dovcols)
        l1 = e->l;
        l3 = e->l->radial_next;
        
-       /* match up loops on each side of an edge corrusponding to each ver */
+       /* match up loops on each side of an edge corresponding to each ver */
        if (l1->v == l3->v) {
                l2 = l1->next;
                l4 = l2->next;
index ce46ae7493daafd86c025131327581d5f1cea4ae..2f47104476b2a44df08064d65fa6e5419137dd8e 100644 (file)
@@ -687,7 +687,7 @@ void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op)
                float (*ofs)[3] = NULL;
 
                /* go through and find any shapekey customdata layers
-                * that might not have corrusponding KeyBlocks, and add them if
+                * that might not have corresponding KeyBlocks, and add them if
                 * necassary */
                j = 0;
                for (i = 0; i < bm->vdata.totlayer; i++) {
index 73436dbfe14643ada5d6b34badfb10718f8b9f53..817c5301780c7f07addef91453eeefc840047302 100644 (file)
@@ -248,7 +248,7 @@ int EDBM_mask_init_backbuf_border(ViewContext *vc, int mcords[][2], short tot, s
        
        /* yah, opengl doesn't do concave... tsk! */
        ED_region_pixelspace(vc->ar);
-       draw_triangulated(mcords, tot);
+       draw_triangulated(mcords, tot);
        
        glBegin(GL_LINE_LOOP);  /* for zero sized masks, lines */
        for (a = 0; a < tot; a++) {
@@ -2720,7 +2720,7 @@ static int loop_to_region(bContext *C, wmOperator *op)
        int a, b;
 
        /* find the set of regions with smallest number of total faces */
-       a = loop_find_regions(em, selbigger);
+       a = loop_find_regions(em, selbigger);
        b = loop_find_regions(em, !selbigger);
        
        if ((a <= b) ^ selbigger) {
index 972236ab411c748f3368be506ed242543428be3b..ada11483f36dfaa7de89e5a52d07e09a30b7aa8c 100644 (file)
@@ -3102,7 +3102,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op)
        
        if (bm->totvertsel < 2) {
                //error("No edges are selected to operate on");
-               return OPERATOR_CANCELLED;;
+               return OPERATOR_CANCELLED;
        }
 
        /* get the cut curve */
index 65a34e2d1b3048c1bbd2ed709a084fc1f9d81282..58b5154cdffb2b1c48b09c6ebce2b73a52f4c5e4 100644 (file)
@@ -113,7 +113,7 @@ void paintface_flush_flags(Object *ob)
 
        if ((index_array = CustomData_get_layer(&dm->faceData, CD_POLYINDEX))) {
                polys = dm->getPolyArray(dm);
-               faces = dm->getTessFaceArray(dm);;
+               faces = dm->getTessFaceArray(dm);
                totface = dm->getNumTessFaces(dm);
 
                /* loop over tessfaces */
index 1b8e90ffce75620a11b17a7db6bb8c60864dda54..5e50990b863faf8901280bad2338fda9479652a3 100755 (executable)
@@ -580,29 +580,29 @@ static void knife_cut_through(knifetool_opdata *kcd)
        if (firstv) {
                /* For each face incident to firstv,
                 * find the first following linehit (if any) sharing that face and connect */
-                for (r = firstfaces.first; r; r = r->next ) {
-                       f = r->ref;
-                       found = 0;
-                       for (j = 0, lh2 = kcd->linehits; j < kcd->totlinehit; j++, lh2++) {
-                               kfe2 = lh2->kfe;
-                               for (r2 = kfe2->faces.first; r2; r2 = r2->next) {
-                                       if (r2->ref == f) {
-                                               v2 = splitkfe[j] ? kfe2->v1 : knife_split_edge(kcd, kfe2, lh2->hit, &splitkfe[j]);
-                                               knife_add_single_cut_through(kcd, firstv, v2, f);
-                                               found = 1;
-                                               break;
-                                       }
-                               }
-                       }
-                       if (!found && lastv) {
+               for (r = firstfaces.first; r; r = r->next ) {
+                       f = r->ref;
+                       found = 0;
+                       for (j = 0, lh2 = kcd->linehits; j < kcd->totlinehit; j++, lh2++) {
+                               kfe2 = lh2->kfe;
+                               for (r2 = kfe2->faces.first; r2; r2 = r2->next) {
+                                       if (r2->ref == f) {
+                                               v2 = splitkfe[j] ? kfe2->v1 : knife_split_edge(kcd, kfe2, lh2->hit, &splitkfe[j]);
+                                               knife_add_single_cut_through(kcd, firstv, v2, f);
+                                               found = 1;
+                                               break;
+                                       }
+                               }
+                       }
+                       if (!found && lastv) {
                                for (r2 = lastfaces.first; r2; r2 = r2->next) {
                                        if (r2->ref == f) {
                                                knife_add_single_cut_through(kcd, firstv, lastv, f);
                                                break;
                                        }
                                }
-                       }
-                }
+                       }
+               }
        }
 
        for (i = 0, lh = kcd->linehits; i < kcd->totlinehit; i++, lh++) {
index c35bf8988b7d08d0630df54718ac240533f89ad7..2be66ca5310bd78c92ea704f3dcb662ddb88315d 100644 (file)
@@ -371,10 +371,10 @@ int ED_mesh_uv_texture_remove(bContext *C, Object *ob, Mesh *me)
        CustomDataLayer *cdlp, *cdlu;
        int index;
 
-       index= CustomData_get_active_layer_index(pdata, CD_MTEXPOLY);
+       index= CustomData_get_active_layer_index(pdata, CD_MTEXPOLY);
        cdlp= (index == -1)? NULL: &pdata->layers[index];
 
-       index= CustomData_get_active_layer_index(ldata, CD_MLOOPUV);
+       index= CustomData_get_active_layer_index(ldata, CD_MLOOPUV);
        cdlu= (index == -1)? NULL: &ldata->layers[index];
        
        if (!cdlp || !cdlu)
index 6825edb0822dd4accc174eabef94f46364e63acf..1626a074c425783cbb9a31c0539341004fefa5ea 100644 (file)
@@ -1748,7 +1748,7 @@ static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op))
                        ob_iter->gameflag = ob->gameflag;
                        ob_iter->gameflag2 = ob->gameflag2;
                        ob_iter->inertia = ob->inertia;
-                       ob_iter->formfactor = ob->formfactor;;
+                       ob_iter->formfactor = ob->formfactor;
                        ob_iter->damping = ob->damping;
                        ob_iter->rdamping = ob->rdamping;
                        ob_iter->min_vel = ob->min_vel;
index 6a9c2755330bab5fe0b09a068a75f42f7abcb20a..fc48516b378807a52b30b47da573c49b9dbe8b0b 100644 (file)
@@ -1143,8 +1143,8 @@ static int select_groped_exec(bContext *C, wmOperator *op)
 
                if(ok) {
                        track->flag|= SELECT;
-                       if(sc->flag&SC_SHOW_MARKER_PATTERN) track->pat_flag|= SELECT;;
-                       if(sc->flag&SC_SHOW_MARKER_SEARCH) track->search_flag|= SELECT;;
+                       if(sc->flag&SC_SHOW_MARKER_PATTERN) track->pat_flag|= SELECT;
+                       if(sc->flag&SC_SHOW_MARKER_SEARCH) track->search_flag|= SELECT;
                }
 
                track= track->next;
index 513df524872d42a183f9277324134796f7e1fb2b..e368d8c10b7cd1981b58c18ba35dce0d5ba42a5b 100644 (file)
@@ -698,7 +698,7 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl)
                        /* LOCATION */
                        ddm->getVertCo(ddm, mp_vi[0], v1);
                        ddm->getVertCo(ddm, mp_vi[1], v2);
-                       ddm->getVertCo(ddm, mp_vi[2], v3);;
+                       ddm->getVertCo(ddm, mp_vi[2], v3);
                        if (mp->totloop >= 4) {
                                ddm->getVertCo(ddm, mp_vi[3], v4);
                        }
index 92912018812428d703e8ad59fc758c693a973f36..2bbbeb0fa31bb2f94d184f763b7bab0220c53f9b 100644 (file)
@@ -2017,7 +2017,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
 
 #endif
 
-       DAG_id_tag_update(obedit->data, 0);
+       DAG_id_tag_update(obedit->data, 0);
        WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit->data);
 
        BLI_array_free(hitv);
index c3c19b683e1cebf219678e61d70d560e1c69931d..a57be322a92b1718655ba5b3125ae49a0f8c8ae5 100644 (file)
@@ -697,7 +697,7 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final)
                                                if(i < numoftris){
                                                        /* using next since the first uv is already accounted for */
                                                        BMLoop *lnext = l->next;
-                                                       MLoopUV *luvnext = CustomData_bmesh_get(&state->em->bm->ldata, lnext->next->head.data, CD_MLOOPUV);;
+                                                       MLoopUV *luvnext = CustomData_bmesh_get(&state->em->bm->ldata, lnext->next->head.data, CD_MLOOPUV);
                                                        luv = CustomData_bmesh_get(&state->em->bm->ldata, lnext->head.data, CD_MLOOPUV);
 
                                                        memcpy(preview->static_tris + buffer_index, fuv->uv, 2*sizeof(float));
index 7d3662c7ffb2b56baccd32476708be234800596c..83307cc2fc687c46ab339a322ad76ff4df754523 100644 (file)
@@ -136,7 +136,7 @@ typedef struct Object {
 
        /* materials */
        struct Material **mat;  /* material slots */
-       char *matbits;                  /* a boolean field, with each byte 1 if corrusponding material is linked to object */
+       char *matbits;                  /* a boolean field, with each byte 1 if corresponding material is linked to object */
        int totcol;                             /* copy of mesh or curve or meta */
        int actcol;                             /* currently selected material in the UI */
        
index fc9ea877da61404f0feaef81c040e19e9aa71507..47e93492e7a438f4d9598e327a0e76aebb391738 100644 (file)
@@ -796,7 +796,7 @@ static PyObject *M_Noise_cell_vector(PyObject *UNUSED(self), PyObject *args)
                return NULL;
 
        cellNoiseV(vec[0], vec[1], vec[2], r_vec);
-       return Vector_CreatePyObject(NULL, 3, Py_NEW, NULL);;
+       return Vector_CreatePyObject(NULL, 3, Py_NEW, NULL);
 }
 
 static PyMethodDef M_Noise_methods[] = {