diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:18:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:18:31 +0400 |
commit | 69e6894b15271884623ea6f56ead06db83acbe99 (patch) | |
tree | b68200606afaca06cf7552f6b12fc20ebd30d487 /source/blender/blenkernel/intern/cdderivedmesh.c | |
parent | 7b99ae0ad3017e373be2a344e30d190b70ca66b4 (diff) |
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 448 |
1 files changed, 229 insertions, 219 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 7b0baf6556a..e3be9c4c236 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -198,7 +198,7 @@ static void cdDM_getVertCos(DerivedMesh *dm, float (*cos_r)[3]) MVert *mv = CDDM_get_verts(dm); int i; - for(i = 0; i < dm->numVertData; i++, mv++) + for (i = 0; i < dm->numVertData; i++, mv++) copy_v3_v3(cos_r[i], mv->co); } @@ -212,7 +212,7 @@ static const MeshElemMap *cdDM_getPolyMap(Object *ob, DerivedMesh *dm) { CDDerivedMesh *cddm = (CDDerivedMesh*) dm; - if(!cddm->pmap && ob->type == OB_MESH) { + if (!cddm->pmap && ob->type == OB_MESH) { Mesh *me= ob->data; create_vert_poly_map(&cddm->pmap, &cddm->pmap_mem, @@ -239,7 +239,7 @@ static int can_pbvh_draw(Object *ob, DerivedMesh *dm) * final DM to give final result to user */ deformed|= ob->sculpt->kb && (ob->shapeflag&OB_SHAPE_LOCK) == 0; - if(deformed) + if (deformed) return 0; return cddm->mvert == me->mvert || ob->sculpt->kb; @@ -249,14 +249,14 @@ static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm) { CDDerivedMesh *cddm = (CDDerivedMesh*) dm; - if(!ob) { + if (!ob) { cddm->pbvh= NULL; return NULL; } - if(!ob->sculpt) + if (!ob->sculpt) return NULL; - if(ob->sculpt->pbvh) { + if (ob->sculpt->pbvh) { cddm->pbvh= ob->sculpt->pbvh; cddm->pbvh_draw = can_pbvh_draw(ob, dm); } @@ -264,7 +264,7 @@ static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm) /* always build pbvh from original mesh, and only use it for drawing if * this derivedmesh is just original mesh. it's the multires subsurf dm * that this is actually for, to support a pbvh on a modified mesh */ - if(!cddm->pbvh && ob->type == OB_MESH) { + if (!cddm->pbvh && ob->type == OB_MESH) { SculptSession *ss= ob->sculpt; Mesh *me= ob->data; cddm->pbvh = BLI_pbvh_new(); @@ -275,7 +275,7 @@ static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm) BLI_pbvh_build_mesh(cddm->pbvh, me->mface, me->mvert, me->totface, me->totvert); - if(ss->modifiers_active && ob->derivedDeform) { + if (ss->modifiers_active && ob->derivedDeform) { DerivedMesh *deformdm= ob->derivedDeform; float (*vertCos)[3]; int totvert; @@ -298,7 +298,7 @@ static void cdDM_update_normals_from_pbvh(DerivedMesh *dm) CDDerivedMesh *cddm = (CDDerivedMesh*) dm; float (*face_nors)[3]; - if(!cddm->pbvh || !cddm->pbvh_draw || !dm->numTessFaceData) + if (!cddm->pbvh || !cddm->pbvh_draw || !dm->numTessFaceData) return; face_nors = CustomData_get_layer(&dm->faceData, CD_NORMAL); @@ -312,16 +312,16 @@ static void cdDM_drawVerts(DerivedMesh *dm) MVert *mv = cddm->mvert; int i; - if( GPU_buffer_legacy(dm) ) { + if ( GPU_buffer_legacy(dm) ) { glBegin(GL_POINTS); - for(i = 0; i < dm->numVertData; i++, mv++) + for (i = 0; i < dm->numVertData; i++, mv++) glVertex3fv(mv->co); glEnd(); } else { /* use OpenGL VBOs or Vertex Arrays instead for better, faster rendering */ GPU_vertex_setup(dm); - if( !GPU_buffer_legacy(dm) ) { - if(dm->drawObject->tot_triangle_point) + if ( !GPU_buffer_legacy(dm) ) { + if (dm->drawObject->tot_triangle_point) glDrawArrays(GL_POINTS,0, dm->drawObject->tot_triangle_point); else glDrawArrays(GL_POINTS,0, dm->drawObject->tot_loose_point); @@ -337,21 +337,22 @@ static void cdDM_drawUVEdges(DerivedMesh *dm) MTFace *tf = DM_get_tessface_data_layer(dm, CD_MTFACE); int i; - if(mf) { - if( GPU_buffer_legacy(dm) ) { + if (mf) { + if ( GPU_buffer_legacy(dm) ) { glBegin(GL_LINES); - for(i = 0; i < dm->numTessFaceData; i++, mf++, tf++) { - if(!(mf->flag&ME_HIDE)) { + for (i = 0; i < dm->numTessFaceData; i++, mf++, tf++) { + if (!(mf->flag&ME_HIDE)) { glVertex2fv(tf->uv[0]); glVertex2fv(tf->uv[1]); glVertex2fv(tf->uv[1]); glVertex2fv(tf->uv[2]); - if(!mf->v4) { + if (!mf->v4) { glVertex2fv(tf->uv[2]); glVertex2fv(tf->uv[0]); - } else { + } + else { glVertex2fv(tf->uv[2]); glVertex2fv(tf->uv[3]); @@ -369,21 +370,21 @@ static void cdDM_drawUVEdges(DerivedMesh *dm) int curpos = 0; GPU_uvedge_setup(dm); - if( !GPU_buffer_legacy(dm) ) { - for(i = 0; i < dm->numTessFaceData; i++, mf++) { - if(!(mf->flag&ME_HIDE)) { + if ( !GPU_buffer_legacy(dm) ) { + for (i = 0; i < dm->numTessFaceData; i++, mf++) { + if (!(mf->flag&ME_HIDE)) { draw = 1; } else { draw = 0; } - if( prevdraw != draw ) { - if( prevdraw > 0 && (curpos-prevstart) > 0) { + if ( prevdraw != draw ) { + if ( prevdraw > 0 && (curpos-prevstart) > 0) { glDrawArrays(GL_LINES,prevstart,curpos-prevstart); } prevstart = curpos; } - if( mf->v4 ) { + if ( mf->v4 ) { curpos += 8; } else { @@ -391,7 +392,7 @@ static void cdDM_drawUVEdges(DerivedMesh *dm) } prevdraw = draw; } - if( prevdraw > 0 && (curpos-prevstart) > 0 ) { + if ( prevdraw > 0 && (curpos-prevstart) > 0 ) { glDrawArrays(GL_LINES,prevstart,curpos-prevstart); } } @@ -407,11 +408,11 @@ static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges MEdge *medge = cddm->medge; int i; - if( GPU_buffer_legacy(dm) ) { + if ( GPU_buffer_legacy(dm) ) { DEBUG_VBO( "Using legacy code. cdDM_drawEdges\n" ); glBegin(GL_LINES); - for(i = 0; i < dm->numEdgeData; i++, medge++) { - if((drawAllEdges || (medge->flag&ME_EDGEDRAW)) + for (i = 0; i < dm->numEdgeData; i++, medge++) { + if ((drawAllEdges || (medge->flag&ME_EDGEDRAW)) && (drawLooseEdges || !(medge->flag&ME_LOOSEEDGE))) { glVertex3fv(mvert[medge->v1].co); glVertex3fv(mvert[medge->v2].co); @@ -425,24 +426,24 @@ static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges int draw = 1; GPU_edge_setup(dm); - if( !GPU_buffer_legacy(dm) ) { - for(i = 0; i < dm->numEdgeData; i++, medge++) { - if((drawAllEdges || (medge->flag&ME_EDGEDRAW)) + if ( !GPU_buffer_legacy(dm) ) { + for (i = 0; i < dm->numEdgeData; i++, medge++) { + if ((drawAllEdges || (medge->flag&ME_EDGEDRAW)) && (drawLooseEdges || !(medge->flag&ME_LOOSEEDGE))) { draw = 1; } else { draw = 0; } - if( prevdraw != draw ) { - if( prevdraw > 0 && (i-prevstart) > 0 ) { + if ( prevdraw != draw ) { + if ( prevdraw > 0 && (i-prevstart) > 0 ) { GPU_buffer_draw_elements(dm->drawObject->edges, GL_LINES, prevstart * 2, (i - prevstart) * 2); } prevstart = i; } prevdraw = draw; } - if( prevdraw > 0 && (i-prevstart) > 0 ) { + if ( prevdraw > 0 && (i-prevstart) > 0 ) { GPU_buffer_draw_elements(dm->drawObject->edges, GL_LINES, prevstart * 2, (i-prevstart) * 2); } } @@ -457,11 +458,11 @@ static void cdDM_drawLooseEdges(DerivedMesh *dm) MEdge *medge = cddm->medge; int i; - if( GPU_buffer_legacy(dm) ) { + if ( GPU_buffer_legacy(dm) ) { DEBUG_VBO( "Using legacy code. cdDM_drawLooseEdges\n" ); glBegin(GL_LINES); - for(i = 0; i < dm->numEdgeData; i++, medge++) { - if(medge->flag&ME_LOOSEEDGE) { + for (i = 0; i < dm->numEdgeData; i++, medge++) { + if (medge->flag&ME_LOOSEEDGE) { glVertex3fv(mvert[medge->v1].co); glVertex3fv(mvert[medge->v2].co); } @@ -474,23 +475,23 @@ static void cdDM_drawLooseEdges(DerivedMesh *dm) int draw = 1; GPU_edge_setup(dm); - if( !GPU_buffer_legacy(dm) ) { - for(i = 0; i < dm->numEdgeData; i++, medge++) { - if(medge->flag&ME_LOOSEEDGE) { + if ( !GPU_buffer_legacy(dm) ) { + for (i = 0; i < dm->numEdgeData; i++, medge++) { + if (medge->flag&ME_LOOSEEDGE) { draw = 1; } else { draw = 0; } - if( prevdraw != draw ) { - if( prevdraw > 0 && (i-prevstart) > 0) { + if ( prevdraw != draw ) { + if ( prevdraw > 0 && (i-prevstart) > 0) { GPU_buffer_draw_elements(dm->drawObject->edges, GL_LINES, prevstart * 2, (i - prevstart) * 2); } prevstart = i; } prevdraw = draw; } - if( prevdraw > 0 && (i-prevstart) > 0 ) { + if ( prevdraw > 0 && (i-prevstart) > 0 ) { GPU_buffer_draw_elements(dm->drawObject->edges, GL_LINES, prevstart * 2, (i - prevstart) * 2); } } @@ -509,15 +510,15 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm, int a, glmode = -1, shademodel = -1, matnr = -1, drawCurrentMat = 1; #define PASSVERT(index) { \ - if(shademodel == GL_SMOOTH) { \ + if (shademodel == GL_SMOOTH) { \ short *no = mvert[index].no; \ glNormal3sv(no); \ } \ glVertex3fv(mvert[index].co); \ } - if(cddm->pbvh && cddm->pbvh_draw) { - if(dm->numTessFaceData) { + if (cddm->pbvh && cddm->pbvh_draw) { + if (dm->numTessFaceData) { float (*face_nors)[3] = CustomData_get_layer(&dm->faceData, CD_NORMAL); BLI_pbvh_draw(cddm->pbvh, partial_redraw_planes, face_nors, setMaterial); @@ -527,17 +528,17 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm, return; } - if( GPU_buffer_legacy(dm) ) { + if ( GPU_buffer_legacy(dm) ) { DEBUG_VBO( "Using legacy code. cdDM_drawFacesSolid\n" ); glBegin(glmode = GL_QUADS); - for(a = 0; a < dm->numTessFaceData; a++, mface++) { + for (a = 0; a < dm->numTessFaceData; a++, mface++) { int new_glmode, new_matnr, new_shademodel; new_glmode = mface->v4?GL_QUADS:GL_TRIANGLES; new_matnr = mface->mat_nr + 1; new_shademodel = (mface->flag & ME_SMOOTH)?GL_SMOOTH:GL_FLAT; - if(new_glmode != glmode || new_matnr != matnr + if (new_glmode != glmode || new_matnr != matnr || new_shademodel != shademodel) { glEnd(); @@ -547,17 +548,18 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm, glBegin(glmode = new_glmode); } - if(drawCurrentMat) { - if(shademodel == GL_FLAT) { + if (drawCurrentMat) { + if (shademodel == GL_FLAT) { if (nors) { glNormal3fv(nors); } else { /* TODO make this better (cache facenormals as layer?) */ float nor[3]; - if(mface->v4) { + if (mface->v4) { normal_quad_v3( nor,mvert[mface->v1].co, mvert[mface->v2].co, mvert[mface->v3].co, mvert[mface->v4].co); - } else { + } + else { normal_tri_v3( nor,mvert[mface->v1].co, mvert[mface->v2].co, mvert[mface->v3].co); } glNormal3fv(nor); @@ -567,22 +569,22 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm, PASSVERT(mface->v1); PASSVERT(mface->v2); PASSVERT(mface->v3); - if(mface->v4) { + if (mface->v4) { PASSVERT(mface->v4); } } - if(nors) nors += 3; + if (nors) nors += 3; } glEnd(); } else { /* use OpenGL VBOs or Vertex Arrays instead for better, faster rendering */ GPU_vertex_setup( dm ); GPU_normal_setup( dm ); - if( !GPU_buffer_legacy(dm) ) { + if ( !GPU_buffer_legacy(dm) ) { glShadeModel(GL_SMOOTH); - for( a = 0; a < dm->drawObject->totmaterial; a++ ) { - if( setMaterial(dm->drawObject->materials[a].mat_nr+1, NULL) ) + for ( a = 0; a < dm->drawObject->totmaterial; a++ ) { + if ( setMaterial(dm->drawObject->materials[a].mat_nr+1, NULL) ) glDrawArrays(GL_TRIANGLES, dm->drawObject->materials[a].start, dm->drawObject->materials[a].totpoint); } @@ -609,46 +611,47 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, int i, j, orig, *index = DM_get_tessface_data_layer(dm, CD_ORIGINDEX); int startFace = 0 /*, lastFlag = 0xdeadbeef */ /* UNUSED */; MCol *mcol = dm->getTessFaceDataArray(dm, CD_PREVIEW_MCOL); - if(!mcol) + if (!mcol) mcol = dm->getTessFaceDataArray(dm, CD_MCOL); cdDM_update_normals_from_pbvh(dm); - if( GPU_buffer_legacy(dm) ) { + if ( GPU_buffer_legacy(dm) ) { DEBUG_VBO( "Using legacy code. cdDM_drawFacesTex_common\n" ); - for(i = 0; i < dm->numTessFaceData; i++, mf++) { + for (i = 0; i < dm->numTessFaceData; i++, mf++) { MVert *mvert; DMDrawOption draw_option; unsigned char *cp = NULL; - if(drawParams) { + if (drawParams) { draw_option = drawParams(tf? &tf[i]: NULL, (mcol != NULL), mf->mat_nr); } else { - if(index) { + if (index) { orig = *index++; - if(orig == ORIGINDEX_NONE) { if(nors) nors += 3; continue; } - if(drawParamsMapped) draw_option = drawParamsMapped(userData, orig); + if (orig == ORIGINDEX_NONE) { if(nors) nors += 3; continue; } + if (drawParamsMapped) draw_option = drawParamsMapped(userData, orig); else { if(nors) nors += 3; continue; } } else - if(drawParamsMapped) draw_option = drawParamsMapped(userData, i); + if (drawParamsMapped) draw_option = drawParamsMapped(userData, i); else { if(nors) nors += 3; continue; } } - if(draw_option != DM_DRAW_OPTION_SKIP) { + if (draw_option != DM_DRAW_OPTION_SKIP) { if (draw_option != DM_DRAW_OPTION_NO_MCOL && mcol) cp= (unsigned char*) &mcol[i*4]; - if(!(mf->flag&ME_SMOOTH)) { + if (!(mf->flag&ME_SMOOTH)) { if (nors) { glNormal3fv(nors); } else { float nor[3]; - if(mf->v4) { + if (mf->v4) { normal_quad_v3( nor,mv[mf->v1].co, mv[mf->v2].co, mv[mf->v3].co, mv[mf->v4].co); - } else { + } + else { normal_tri_v3( nor,mv[mf->v1].co, mv[mf->v2].co, mv[mf->v3].co); } glNormal3fv(nor); @@ -656,55 +659,57 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, } glBegin(mf->v4?GL_QUADS:GL_TRIANGLES); - if(tf) glTexCoord2fv(tf[i].uv[0]); - if(cp) glColor3ub(cp[3], cp[2], cp[1]); + if (tf) glTexCoord2fv(tf[i].uv[0]); + if (cp) glColor3ub(cp[3], cp[2], cp[1]); mvert = &mv[mf->v1]; - if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no); + if (mf->flag&ME_SMOOTH) glNormal3sv(mvert->no); glVertex3fv(mvert->co); - if(tf) glTexCoord2fv(tf[i].uv[1]); - if(cp) glColor3ub(cp[7], cp[6], cp[5]); + if (tf) glTexCoord2fv(tf[i].uv[1]); + if (cp) glColor3ub(cp[7], cp[6], cp[5]); mvert = &mv[mf->v2]; - if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no); + if (mf->flag&ME_SMOOTH) glNormal3sv(mvert->no); glVertex3fv(mvert->co); - if(tf) glTexCoord2fv(tf[i].uv[2]); - if(cp) glColor3ub(cp[11], cp[10], cp[9]); + if (tf) glTexCoord2fv(tf[i].uv[2]); + if (cp) glColor3ub(cp[11], cp[10], cp[9]); mvert = &mv[mf->v3]; - if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no); + if (mf->flag&ME_SMOOTH) glNormal3sv(mvert->no); glVertex3fv(mvert->co); - if(mf->v4) { - if(tf) glTexCoord2fv(tf[i].uv[3]); - if(cp) glColor3ub(cp[15], cp[14], cp[13]); + if (mf->v4) { + if (tf) glTexCoord2fv(tf[i].uv[3]); + if (cp) glColor3ub(cp[15], cp[14], cp[13]); mvert = &mv[mf->v4]; - if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no); + if (mf->flag&ME_SMOOTH) glNormal3sv(mvert->no); glVertex3fv(mvert->co); } glEnd(); } - if(nors) nors += 3; + if (nors) nors += 3; } - } else { /* use OpenGL VBOs or Vertex Arrays instead for better, faster rendering */ + } + else { /* use OpenGL VBOs or Vertex Arrays instead for better, faster rendering */ MCol *col = realcol; - if(!col) + if (!col) col = mcol; GPU_vertex_setup( dm ); GPU_normal_setup( dm ); GPU_uv_setup( dm ); - if( col != NULL ) { + if ( col != NULL ) { /*if( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) { col = 0; - } else if( mcol && dm->drawObject->colType == CD_MCOL ) { + } + else if ( mcol && dm->drawObject->colType == CD_MCOL ) { col = 0; } - if( col != 0 ) {*/ + if ( col != 0 ) {*/ unsigned char *colors = MEM_mallocN(dm->getNumTessFaces(dm)*4*3*sizeof(unsigned char), "cdDM_drawFacesTex_common"); - for( i=0; i < dm->getNumTessFaces(dm); i++ ) { - for( j=0; j < 4; j++ ) { + for ( i=0; i < dm->getNumTessFaces(dm); i++ ) { + for ( j=0; j < 4; j++ ) { /* bgr -> rgb is intentional (and stupid), but how its stored internally */ colors[i*12+j*3] = col[i*4+j].b; colors[i*12+j*3+1] = col[i*4+j].g; @@ -713,58 +718,58 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, } GPU_color3_upload(dm,colors); MEM_freeN(colors); - if(realcol) + if (realcol) dm->drawObject->colType = CD_TEXTURE_MCOL; - else if(mcol) + else if (mcol) dm->drawObject->colType = CD_MCOL; //} GPU_color_setup( dm ); } - if( !GPU_buffer_legacy(dm) ) { + if ( !GPU_buffer_legacy(dm) ) { int tottri = dm->drawObject->tot_triangle_point/3; int next_actualFace= dm->drawObject->triangle_to_mface[0]; glShadeModel( GL_SMOOTH ); /* lastFlag = 0; */ /* UNUSED */ - for(i = 0; i < tottri; i++) { + for (i = 0; i < tottri; i++) { int actualFace = next_actualFace; DMDrawOption draw_option = DM_DRAW_OPTION_NORMAL; int flush = 0; - if(i != tottri-1) + if (i != tottri-1) next_actualFace= dm->drawObject->triangle_to_mface[i+1]; - if(drawParams) { + if (drawParams) { draw_option = drawParams(tf? &tf[actualFace]: NULL, (mcol != NULL), mf[actualFace].mat_nr); } else { - if(index) { + if (index) { orig = index[actualFace]; - if(orig == ORIGINDEX_NONE) continue; - if(drawParamsMapped) + if (orig == ORIGINDEX_NONE) continue; + if (drawParamsMapped) draw_option = drawParamsMapped(userData, orig); } else - if(drawParamsMapped) + if (drawParamsMapped) draw_option = drawParamsMapped(userData, actualFace); } /* flush buffer if current triangle isn't drawable or it's last triangle */ flush= (draw_option == DM_DRAW_OPTION_SKIP) || (i == tottri - 1); - if(!flush && compareDrawOptions) { + if (!flush && compareDrawOptions) { /* also compare draw options and flush buffer if they're different * need for face selection highlight in edit mode */ flush|= compareDrawOptions(userData, actualFace, next_actualFace) == 0; } - if(flush) { + if (flush) { int first= startFace*3; /* Add one to the length if we're drawing at the end of the array */ int count= (i-startFace+(draw_option != DM_DRAW_OPTION_SKIP ? 1 : 0))*3; - if(count) { + if (count) { if (col) GPU_color_switch(1); else @@ -806,32 +811,32 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int i, orig, *index = DM_get_tessface_data_layer(dm, CD_ORIGINDEX); mc = DM_get_tessface_data_layer(dm, CD_ID_MCOL); - if(!mc) + if (!mc) mc = DM_get_tessface_data_layer(dm, CD_PREVIEW_MCOL); - if(!mc) + if (!mc) mc = DM_get_tessface_data_layer(dm, CD_MCOL); cdDM_update_normals_from_pbvh(dm); /* back-buffer always uses legacy since VBO's would need the * color array temporarily overwritten for drawing, then reset. */ - if( GPU_buffer_legacy(dm) || G.f & G_BACKBUFSEL) { + if ( GPU_buffer_legacy(dm) || G.f & G_BACKBUFSEL) { DEBUG_VBO( "Using legacy code. cdDM_drawMappedFaces\n" ); - for(i = 0; i < dm->numTessFaceData; i++, mf++) { + for (i = 0; i < dm->numTessFaceData; i++, mf++) { int drawSmooth = (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : (mf->flag & ME_SMOOTH); DMDrawOption draw_option= DM_DRAW_OPTION_NORMAL; orig= (index==NULL) ? i : *index++; - if(orig == ORIGINDEX_NONE) + if (orig == ORIGINDEX_NONE) draw_option= setMaterial(mf->mat_nr + 1, NULL); else if (setDrawOptions != NULL) draw_option= setDrawOptions(userData, orig); - if(draw_option != DM_DRAW_OPTION_SKIP) { + if (draw_option != DM_DRAW_OPTION_SKIP) { unsigned char *cp = NULL; - if(useColors && mc) + if (useColors && mc) cp = (unsigned char *)&mc[i * 4]; /* no need to set shading mode to flat because @@ -845,36 +850,38 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, } else { float nor[3]; - if(mf->v4) { + if (mf->v4) { normal_quad_v3( nor,mv[mf->v1].co, mv[mf->v2].co, mv[mf->v3].co, mv[mf->v4].co); - } else { + } + else { normal_tri_v3( nor,mv[mf->v1].co, mv[mf->v2].co, mv[mf->v3].co); } glNormal3fv(nor); } - if(cp) glColor3ub(cp[3], cp[2], cp[1]); + if (cp) glColor3ub(cp[3], cp[2], cp[1]); glVertex3fv(mv[mf->v1].co); - if(cp) glColor3ub(cp[7], cp[6], cp[5]); + if (cp) glColor3ub(cp[7], cp[6], cp[5]); glVertex3fv(mv[mf->v2].co); - if(cp) glColor3ub(cp[11], cp[10], cp[9]); + if (cp) glColor3ub(cp[11], cp[10], cp[9]); glVertex3fv(mv[mf->v3].co); - if(mf->v4) { - if(cp) glColor3ub(cp[15], cp[14], cp[13]); + if (mf->v4) { + if (cp) glColor3ub(cp[15], cp[14], cp[13]); glVertex3fv(mv[mf->v4].co); } - } else { - if(cp) glColor3ub(cp[3], cp[2], cp[1]); + } + else { + if (cp) glColor3ub(cp[3], cp[2], cp[1]); glNormal3sv(mv[mf->v1].no); glVertex3fv(mv[mf->v1].co); - if(cp) glColor3ub(cp[7], cp[6], cp[5]); + if (cp) glColor3ub(cp[7], cp[6], cp[5]); glNormal3sv(mv[mf->v2].no); glVertex3fv(mv[mf->v2].co); - if(cp) glColor3ub(cp[11], cp[10], cp[9]); + if (cp) glColor3ub(cp[11], cp[10], cp[9]); glNormal3sv(mv[mf->v3].no); glVertex3fv(mv[mf->v3].co); - if(mf->v4) { - if(cp) glColor3ub(cp[15], cp[14], cp[13]); + if (mf->v4) { + if (cp) glColor3ub(cp[15], cp[14], cp[13]); glNormal3sv(mv[mf->v4].no); glVertex3fv(mv[mf->v4].co); } @@ -890,16 +897,16 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int prevstart = 0; GPU_vertex_setup(dm); GPU_normal_setup(dm); - if( useColors && mc ) + if ( useColors && mc ) GPU_color_setup(dm); - if( !GPU_buffer_legacy(dm) ) { + if ( !GPU_buffer_legacy(dm) ) { int tottri = dm->drawObject->tot_triangle_point/3; glShadeModel(GL_SMOOTH); - if(tottri == 0) { + if (tottri == 0) { /* avoid buffer problems in following code */ } - if(setDrawOptions == NULL) { + if (setDrawOptions == NULL) { /* just draw the entire face array */ glDrawArrays(GL_TRIANGLES, 0, (tottri) * 3); } @@ -907,7 +914,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, /* we need to check if the next material changes */ int next_actualFace= dm->drawObject->triangle_to_mface[0]; - for( i = 0; i < tottri; i++ ) { + for ( i = 0; i < tottri; i++ ) { //int actualFace = dm->drawObject->triangle_to_mface[i]; int actualFace = next_actualFace; MFace *mface= mf + actualFace; @@ -915,12 +922,12 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, DMDrawOption draw_option = DM_DRAW_OPTION_NORMAL; int flush = 0; - if(i != tottri-1) + if (i != tottri-1) next_actualFace= dm->drawObject->triangle_to_mface[i+1]; orig= (index==NULL) ? actualFace : index[actualFace]; - if(orig == ORIGINDEX_NONE) + if (orig == ORIGINDEX_NONE) draw_option= setMaterial(mface->mat_nr + 1, NULL); else if (setDrawOptions != NULL) draw_option= setDrawOptions(userData, orig); @@ -935,16 +942,16 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, /* ... or when material setting is dissferent */ flush|= mf[actualFace].mat_nr != mf[next_actualFace].mat_nr; - if(!flush && compareDrawOptions) { + if (!flush && compareDrawOptions) { flush|= compareDrawOptions(userData, actualFace, next_actualFace) == 0; } - if(flush) { + if (flush) { int first= prevstart*3; /* Add one to the length if we're drawing at the end of the array */ int count= (i-prevstart+(draw_option != DM_DRAW_OPTION_SKIP ? 1 : 0))*3; - if(count) + if (count) glDrawArrays(GL_TRIANGLES, first, count); prevstart = i + 1; @@ -971,25 +978,25 @@ static void cddm_draw_attrib_vertex(DMVertexAttribs *attribs, MVert *mvert, int int b; /* orco texture coordinates */ - if(attribs->totorco) { - if(attribs->orco.glTexco) + if (attribs->totorco) { + if (attribs->orco.glTexco) glTexCoord3fv(attribs->orco.array[index]); else glVertexAttrib3fvARB(attribs->orco.glIndex, attribs->orco.array[index]); } /* uv texture coordinates */ - for(b = 0; b < attribs->tottface; b++) { + for (b = 0; b < attribs->tottface; b++) { MTFace *tf = &attribs->tface[b].array[a]; - if(attribs->tface[b].glTexco) + if (attribs->tface[b].glTexco) glTexCoord2fv(tf->uv[vert]); else glVertexAttrib2fvARB(attribs->tface[b].glIndex, tf->uv[vert]); } /* vertex colors */ - for(b = 0; b < attribs->totmcol; b++) { + for (b = 0; b < attribs->totmcol; b++) { MCol *cp = &attribs->mcol[b].array[a*4 + vert]; GLubyte col[4]; col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a; @@ -997,13 +1004,13 @@ static void cddm_draw_attrib_vertex(DMVertexAttribs *attribs, MVert *mvert, int } /* tangent for normal mapping */ - if(attribs->tottang) { + if (attribs->tottang) { float *tang = attribs->tang.array[a*4 + vert]; glVertexAttrib4fvARB(attribs->tang.glIndex, tang); } /* vertex normal */ - if(smoothnormal) + if (smoothnormal) glNormal3sv(mvert[index].no); /* vertex coordinate */ @@ -1032,52 +1039,53 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, glShadeModel(GL_SMOOTH); - if( GPU_buffer_legacy(dm) || setDrawOptions != NULL ) { + if ( GPU_buffer_legacy(dm) || setDrawOptions != NULL ) { DEBUG_VBO( "Using legacy code. cdDM_drawMappedFacesGLSL\n" ); memset(&attribs, 0, sizeof(attribs)); glBegin(GL_QUADS); - for(a = 0; a < dm->numTessFaceData; a++, mface++) { + for (a = 0; a < dm->numTessFaceData; a++, mface++) { const int smoothnormal = (mface->flag & ME_SMOOTH); new_matnr = mface->mat_nr + 1; - if(new_matnr != matnr) { + if (new_matnr != matnr) { glEnd(); dodraw = setMaterial(matnr = new_matnr, &gattribs); - if(dodraw) + if (dodraw) DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs); glBegin(GL_QUADS); } - if(!dodraw) { + if (!dodraw) { continue; } - else if(setDrawOptions) { + else if (setDrawOptions) { orig = (index)? index[a]: a; - if(orig == ORIGINDEX_NONE) { + if (orig == ORIGINDEX_NONE) { /* since the material is set by setMaterial(), faces with no * origin can be assumed to be generated by a modifier */ /* continue */ } - else if(setDrawOptions(userData, orig) == DM_DRAW_OPTION_SKIP) + else if (setDrawOptions(userData, orig) == DM_DRAW_OPTION_SKIP) continue; } - if(!smoothnormal) { - if(nors) { + if (!smoothnormal) { + if (nors) { glNormal3fv(nors[a]); } else { /* TODO ideally a normal layer should always be available */ float nor[3]; - if(mface->v4) { + if (mface->v4) { normal_quad_v3( nor,mvert[mface->v1].co, mvert[mface->v2].co, mvert[mface->v3].co, mvert[mface->v4].co); - } else { + } + else { normal_tri_v3( nor,mvert[mface->v1].co, mvert[mface->v2].co, mvert[mface->v3].co); } glNormal3fv(nor); @@ -1088,7 +1096,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, cddm_draw_attrib_vertex(&attribs, mvert, a, mface->v2, 1, smoothnormal); cddm_draw_attrib_vertex(&attribs, mvert, a, mface->v3, 2, smoothnormal); - if(mface->v4) + if (mface->v4) cddm_draw_attrib_vertex(&attribs, mvert, a, mface->v4, 3, smoothnormal); else cddm_draw_attrib_vertex(&attribs, mvert, a, mface->v3, 2, smoothnormal); @@ -1109,21 +1117,21 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, GPU_vertex_setup(dm); GPU_normal_setup(dm); - if( !GPU_buffer_legacy(dm) ) { - for( i = 0; i < dm->drawObject->tot_triangle_point/3; i++ ) { + if ( !GPU_buffer_legacy(dm) ) { + for ( i = 0; i < dm->drawObject->tot_triangle_point/3; i++ ) { a = dm->drawObject->triangle_to_mface[i]; mface = mf + a; new_matnr = mface->mat_nr + 1; - if(new_matnr != matnr ) { + if (new_matnr != matnr ) { numfaces = curface - start; - if( numfaces > 0 ) { + if ( numfaces > 0 ) { - if( dodraw ) { + if ( dodraw ) { - if( numdata != 0 ) { + if ( numdata != 0 ) { GPU_buffer_unlock(buffer); @@ -1132,7 +1140,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, glDrawArrays(GL_TRIANGLES,start*3,numfaces*3); - if( numdata != 0 ) { + if ( numdata != 0 ) { GPU_buffer_free(buffer); @@ -1145,43 +1153,43 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, start = curface; /* prevdraw = dodraw; */ /* UNUSED */ dodraw = setMaterial(matnr = new_matnr, &gattribs); - if(dodraw) { + if (dodraw) { DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs); - if(attribs.totorco) { + if (attribs.totorco) { datatypes[numdata].index = attribs.orco.glIndex; datatypes[numdata].size = 3; datatypes[numdata].type = GL_FLOAT; numdata++; } - for(b = 0; b < attribs.tottface; b++) { + for (b = 0; b < attribs.tottface; b++) { datatypes[numdata].index = attribs.tface[b].glIndex; datatypes[numdata].size = 2; datatypes[numdata].type = GL_FLOAT; numdata++; } - for(b = 0; b < attribs.totmcol; b++) { + for (b = 0; b < attribs.totmcol; b++) { datatypes[numdata].index = attribs.mcol[b].glIndex; datatypes[numdata].size = 4; datatypes[numdata].type = GL_UNSIGNED_BYTE; numdata++; } - if(attribs.tottang) { + if (attribs.tottang) { datatypes[numdata].index = attribs.tang.glIndex; datatypes[numdata].size = 4; datatypes[numdata].type = GL_FLOAT; numdata++; } - if( numdata != 0 ) { + if ( numdata != 0 ) { elementsize = GPU_attrib_element_size( datatypes, numdata ); buffer = GPU_buffer_alloc( elementsize*dm->drawObject->tot_triangle_point); - if( buffer == NULL ) { + if ( buffer == NULL ) { GPU_buffer_unbind(); dm->drawObject->legacy = 1; return; } varray = GPU_buffer_lock_stream(buffer); - if( varray == NULL ) { + if ( varray == NULL ) { GPU_buffer_unbind(); GPU_buffer_free(buffer); dm->drawObject->legacy = 1; @@ -1197,15 +1205,15 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, } } - if(dodraw && numdata != 0 ) { + if (dodraw && numdata != 0 ) { offset = 0; - if(attribs.totorco) { + if (attribs.totorco) { copy_v3_v3((float *)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v1]); copy_v3_v3((float *)&varray[elementsize*curface*3+elementsize],(float *)attribs.orco.array[mface->v2]); copy_v3_v3((float *)&varray[elementsize*curface*3+elementsize*2],(float *)attribs.orco.array[mface->v3]); offset += sizeof(float)*3; } - for(b = 0; b < attribs.tottface; b++) { + for (b = 0; b < attribs.tottface; b++) { MTFace *tf = &attribs.tface[b].array[a]; copy_v2_v2((float *)&varray[elementsize*curface*3+offset],tf->uv[0]); copy_v2_v2((float *)&varray[elementsize*curface*3+offset+elementsize],tf->uv[1]); @@ -1213,7 +1221,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, copy_v2_v2((float *)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[2]); offset += sizeof(float)*2; } - for(b = 0; b < attribs.totmcol; b++) { + for (b = 0; b < attribs.totmcol; b++) { MCol *cp = &attribs.mcol[b].array[a*4 + 0]; GLubyte col[4]; col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a; @@ -1226,7 +1234,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, copy_v4_v4_char((char *)&varray[elementsize*curface*3+offset+elementsize*2], (char *)col); offset += sizeof(unsigned char)*4; } - if(attribs.tottang) { + if (attribs.tottang) { float *tang = attribs.tang.array[a*4 + 0]; copy_v4_v4((float *)&varray[elementsize*curface*3+offset], tang); tang = attribs.tang.array[a*4 + 1]; @@ -1238,23 +1246,23 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, (void)offset; } curface++; - if(mface->v4) { - if(dodraw && numdata != 0 ) { + if (mface->v4) { + if (dodraw && numdata != 0 ) { offset = 0; - if(attribs.totorco) { + if (attribs.totorco) { copy_v3_v3((float *)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v3]); copy_v3_v3((float *)&varray[elementsize*curface*3+elementsize],(float *)attribs.orco.array[mface->v4]); copy_v3_v3((float *)&varray[elementsize*curface*3+elementsize*2],(float *)attribs.orco.array[mface->v1]); offset += sizeof(float)*3; } - for(b = 0; b < attribs.tottface; b++) { + for (b = 0; b < attribs.tottface; b++) { MTFace *tf = &attribs.tface[b].array[a]; copy_v2_v2((float *)&varray[elementsize*curface*3+offset],tf->uv[2]); copy_v2_v2((float *)&varray[elementsize*curface*3+offset+elementsize],tf->uv[3]); copy_v2_v2((float *)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[0]); offset += sizeof(float)*2; } - for(b = 0; b < attribs.totmcol; b++) { + for (b = 0; b < attribs.totmcol; b++) { MCol *cp = &attribs.mcol[b].array[a*4 + 2]; GLubyte col[4]; col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a; @@ -1267,7 +1275,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, copy_v4_v4_char((char *)&varray[elementsize*curface*3+offset+elementsize*2], (char *)col); offset += sizeof(unsigned char)*4; } - if(attribs.tottang) { + if (attribs.tottang) { float *tang = attribs.tang.array[a*4 + 2]; copy_v4_v4((float *)&varray[elementsize*curface*3+offset], tang); tang = attribs.tang.array[a*4 + 3]; @@ -1283,9 +1291,9 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, } } numfaces = curface - start; - if( numfaces > 0 ) { - if( dodraw ) { - if( numdata != 0 ) { + if ( numfaces > 0 ) { + if ( dodraw ) { + if ( numdata != 0 ) { GPU_buffer_unlock(buffer); GPU_interleaved_attrib_setup(buffer,datatypes,numdata); } @@ -1328,13 +1336,13 @@ static void cdDM_drawMappedFacesMat(DerivedMesh *dm, glBegin(GL_QUADS); - for(a = 0; a < dm->numTessFaceData; a++, mf++) { + for (a = 0; a < dm->numTessFaceData; a++, mf++) { const int smoothnormal = (mf->flag & ME_SMOOTH); /* material */ new_matnr = mf->mat_nr + 1; - if(new_matnr != matnr) { + if (new_matnr != matnr) { glEnd(); setMaterial(userData, matnr = new_matnr, &gattribs); @@ -1344,23 +1352,23 @@ static void cdDM_drawMappedFacesMat(DerivedMesh *dm, } /* skipping faces */ - if(setFace) { + if (setFace) { orig = (index)? index[a]: a; - if(orig != ORIGINDEX_NONE && !setFace(userData, orig)) + if (orig != ORIGINDEX_NONE && !setFace(userData, orig)) continue; } /* smooth normal */ - if(!smoothnormal) { - if(nors) { + if (!smoothnormal) { + if (nors) { glNormal3fv(nors[a]); } else { /* TODO ideally a normal layer should always be available */ float nor[3]; - if(mf->v4) + if (mf->v4) normal_quad_v3( nor,mvert[mf->v1].co, mvert[mf->v2].co, mvert[mf->v3].co, mvert[mf->v4].co); else normal_tri_v3( nor,mvert[mf->v1].co, mvert[mf->v2].co, mvert[mf->v3].co); @@ -1374,7 +1382,7 @@ static void cdDM_drawMappedFacesMat(DerivedMesh *dm, cddm_draw_attrib_vertex(&attribs, mvert, a, mf->v2, 1, smoothnormal); cddm_draw_attrib_vertex(&attribs, mvert, a, mf->v3, 2, smoothnormal); - if(mf->v4) + if (mf->v4) cddm_draw_attrib_vertex(&attribs, mvert, a, mf->v4, 3, smoothnormal); else cddm_draw_attrib_vertex(&attribs, mvert, a, mf->v3, 2, smoothnormal); @@ -1392,15 +1400,15 @@ static void cdDM_drawMappedEdges(DerivedMesh *dm, DMSetDrawOptions setDrawOption int i, orig, *index = DM_get_edge_data_layer(dm, CD_ORIGINDEX); glBegin(GL_LINES); - for(i = 0; i < dm->numEdgeData; i++, edge++) { - if(index) { + for (i = 0; i < dm->numEdgeData; i++, edge++) { + if (index) { orig = *index++; - if(setDrawOptions && orig == ORIGINDEX_NONE) continue; + if (setDrawOptions && orig == ORIGINDEX_NONE) continue; } else orig = i; - if(!setDrawOptions || (setDrawOptions(userData, orig) != DM_DRAW_OPTION_SKIP)) { + if (!setDrawOptions || (setDrawOptions(userData, orig) != DM_DRAW_OPTION_SKIP)) { glVertex3fv(vert[edge->v1].co); glVertex3fv(vert[edge->v2].co); } @@ -1417,10 +1425,10 @@ static void cdDM_foreachMappedVert( MVert *mv = CDDM_get_verts(dm); int i, orig, *index = DM_get_vert_data_layer(dm, CD_ORIGINDEX); - for(i = 0; i < dm->numVertData; i++, mv++) { - if(index) { + for (i = 0; i < dm->numVertData; i++, mv++) { + if (index) { orig = *index++; - if(orig == ORIGINDEX_NONE) continue; + if (orig == ORIGINDEX_NONE) continue; func(userData, orig, mv->co, NULL, mv->no); } else @@ -1439,10 +1447,10 @@ static void cdDM_foreachMappedEdge( MEdge *med = cddm->medge; int i, orig, *index = DM_get_edge_data_layer(dm, CD_ORIGINDEX); - for(i = 0; i < dm->numEdgeData; i++, med++) { + for (i = 0; i < dm->numEdgeData; i++, med++) { if (index) { orig = *index++; - if(orig == ORIGINDEX_NONE) continue; + if (orig == ORIGINDEX_NONE) continue; func(userData, orig, mv[med->v1].co, mv[med->v2].co); } else @@ -1464,13 +1472,13 @@ static void cdDM_foreachMappedFaceCenter( index = CustomData_get_layer(&dm->polyData, CD_ORIGINDEX); mf = cddm->mpoly; - for(i = 0; i < dm->numPolyData; i++, mf++) { + for (i = 0; i < dm->numPolyData; i++, mf++) { float cent[3]; float no[3]; if (index) { orig = *index++; - if(orig == ORIGINDEX_NONE) continue; + if (orig == ORIGINDEX_NONE) continue; } else orig = i; @@ -1486,7 +1494,8 @@ static void cdDM_foreachMappedFaceCenter( if (j > 3) { normal_quad_v3(no, mv[ml->v].co, mv[(ml+1)->v].co, mv[(ml+2)->v].co, mv[(ml+3)->v].co); - } else { + } + else { normal_tri_v3(no, mv[ml->v].co, mv[(ml+1)->v].co, mv[(ml+2)->v].co); } @@ -1523,8 +1532,8 @@ void CDDM_recalc_tessellation(DerivedMesh *dm) static void cdDM_free_internal(CDDerivedMesh *cddm) { - if(cddm->pmap) MEM_freeN(cddm->pmap); - if(cddm->pmap_mem) MEM_freeN(cddm->pmap_mem); + if (cddm->pmap) MEM_freeN(cddm->pmap); + if (cddm->pmap_mem) MEM_freeN(cddm->pmap_mem); } static void cdDM_release(DerivedMesh *dm) @@ -1882,7 +1891,7 @@ DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *UNUSED(me), int use_mdis polyindex = dm->getTessFaceDataArray(dm, CD_POLYINDEX); index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX); - for(i = 0; i < dm->numTessFaceData; i++, index++, polyindex++) { + for (i = 0; i < dm->numTessFaceData; i++, index++, polyindex++) { MFace *mf = &mface[i]; BMLoop **l = em->looptris[i]; efa = l[0]->f; @@ -2020,13 +2029,13 @@ DerivedMesh *CDDM_from_template(DerivedMesh *source, CustomData_add_layer(&dm->loopData, CD_MLOOP, CD_CALLOC, NULL, numLoops); CustomData_add_layer(&dm->polyData, CD_MPOLY, CD_CALLOC, NULL, numPolys); - if(!CustomData_get_layer(&dm->vertData, CD_ORIGINDEX)) + if (!CustomData_get_layer(&dm->vertData, CD_ORIGINDEX)) CustomData_add_layer(&dm->vertData, CD_ORIGINDEX, CD_CALLOC, NULL, numVerts); - if(!CustomData_get_layer(&dm->edgeData, CD_ORIGINDEX)) + if (!CustomData_get_layer(&dm->edgeData, CD_ORIGINDEX)) CustomData_add_layer(&dm->edgeData, CD_ORIGINDEX, CD_CALLOC, NULL, numEdges); - if(!CustomData_get_layer(&dm->faceData, CD_ORIGINDEX)) + if (!CustomData_get_layer(&dm->faceData, CD_ORIGINDEX)) CustomData_add_layer(&dm->faceData, CD_ORIGINDEX, CD_CALLOC, NULL, numTessFaces); - if(!CustomData_get_layer(&dm->faceData, CD_POLYINDEX)) + if (!CustomData_get_layer(&dm->faceData, CD_POLYINDEX)) CustomData_add_layer(&dm->faceData, CD_POLYINDEX, CD_CALLOC, NULL, numTessFaces); cddm->mvert = CustomData_get_layer(&dm->vertData, CD_MVERT); @@ -2048,7 +2057,7 @@ void CDDM_apply_vert_coords(DerivedMesh *dm, float (*vertCoords)[3]) vert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData); cddm->mvert = vert; - for(i = 0; i < dm->numVertData; ++i, ++vert) + for (i = 0; i < dm->numVertData; ++i, ++vert) copy_v3_v3(vert->co, vertCoords[i]); } @@ -2062,7 +2071,7 @@ void CDDM_apply_vert_normals(DerivedMesh *dm, short (*vertNormals)[3]) vert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData); cddm->mvert = vert; - for(i = 0; i < dm->numVertData; ++i, ++vert) + for (i = 0; i < dm->numVertData; ++i, ++vert) copy_v3_v3_short(vert->no, vertNormals[i]); } @@ -2071,7 +2080,7 @@ void CDDM_calc_normals_mapping_ex(DerivedMesh *dm, const short only_face_normals CDDerivedMesh *cddm = (CDDerivedMesh*)dm; float (*face_nors)[3] = NULL; - if(dm->numVertData == 0) return; + if (dm->numVertData == 0) return; /* now we skip calculating vertex normals for referenced layer, * no need to duplicate verts. @@ -2125,7 +2134,7 @@ void CDDM_calc_normals(DerivedMesh *dm) CDDerivedMesh *cddm = (CDDerivedMesh*)dm; float (*poly_nors)[3]; - if(dm->numVertData == 0) return; + if (dm->numVertData == 0) return; /* we don't want to overwrite any referenced layers */ cddm->mvert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData); @@ -2145,7 +2154,7 @@ void CDDM_calc_normals_tessface(DerivedMesh *dm) CDDerivedMesh *cddm = (CDDerivedMesh*)dm; float (*face_nors)[3]; - if(dm->numVertData == 0) return; + if (dm->numVertData == 0) return; /* we don't want to overwrite any referenced layers */ cddm->mvert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData); @@ -2367,7 +2376,8 @@ void CDDM_calc_edges_tessface(DerivedMesh *dm) BLI_edgehash_insert(eh, mf->v3, mf->v4, NULL); if (!BLI_edgehash_haskey(eh, mf->v4, mf->v1)) BLI_edgehash_insert(eh, mf->v4, mf->v1, NULL); - } else { + } + else { if (!BLI_edgehash_haskey(eh, mf->v3, mf->v1)) BLI_edgehash_insert(eh, mf->v3, mf->v1, NULL); } @@ -2383,7 +2393,7 @@ void CDDM_calc_edges_tessface(DerivedMesh *dm) ehi = BLI_edgehashIterator_new(eh); med = CustomData_get_layer(&edgeData, CD_MEDGE); index = CustomData_get_layer(&edgeData, CD_ORIGINDEX); - for(i = 0; !BLI_edgehashIterator_isDone(ehi); + for (i = 0; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi), ++i, ++med, ++index) { BLI_edgehashIterator_getKey(ehi, &med->v1, &med->v2); @@ -2446,7 +2456,7 @@ void CDDM_calc_edges(DerivedMesh *dm) ehi = BLI_edgehashIterator_new(eh); med = CustomData_get_layer(&edgeData, CD_MEDGE); index = CustomData_get_layer(&edgeData, CD_ORIGINDEX); - for(i = 0; !BLI_edgehashIterator_isDone(ehi); + for (i = 0; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi), ++i, ++med, ++index) { BLI_edgehashIterator_getKey(ehi, &med->v1, &med->v2); j = GET_INT_FROM_POINTER(BLI_edgehashIterator_getValue(ehi)); |