Revision: 18572 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18572 Author: joeedh Date: 2009-01-19 11:35:14 +0100 (Mon, 19 Jan 2009)
Log Message: ----------- customdata works properly again Modified Paths: -------------- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c =================================================================== --- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c 2009-01-19 06:04:57 UTC (rev 18571) +++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c 2009-01-19 10:35:14 UTC (rev 18572) @@ -196,9 +196,9 @@ int totvert, i, numTex, numCol; em = MEM_callocN(sizeof(EditMesh), "EditMesh from bmesh"); - - if(bm->selectmode & BM_VERT) em->selectmode |= SCE_SELECT_VERTEX; - if(bm->selectmode & BM_EDGE) em->selectmode |= SCE_SELECT_EDGE; + + if(bm->selectmode & BM_VERT) em->selectmode |= SCE_SELECT_VERTEX; + if(bm->selectmode & BM_EDGE) em->selectmode |= SCE_SELECT_EDGE; if(bm->selectmode & BM_FACE) em->selectmode |= SCE_SELECT_FACE; CustomData_copy(&bm->vdata, &em->vdata, CD_MASK_BMESH, CD_CALLOC, 0); Modified: branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c =================================================================== --- branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c 2009-01-19 06:04:57 UTC (rev 18571) +++ branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c 2009-01-19 10:35:14 UTC (rev 18572) @@ -59,7 +59,7 @@ texpoly->tile = texface->tile; texpoly->unwrap = texface->unwrap; - for (j=0, l=BMIter_New(&iter, bm, BM_LOOPS_OF_FACE, f); f; j++, f=BMIter_Step(&iter)) { + for (j=0, l=BMIter_New(&iter, bm, BM_LOOPS_OF_FACE, f); l; j++, l=BMIter_Step(&iter)) { mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i); mloopuv->uv[0] = texface->uv[j][0]; mloopuv->uv[1] = texface->uv[j][1]; @@ -68,7 +68,7 @@ } for(i=0; i < numCol; i++){ mcol = CustomData_em_get_n(facedata, face_block, CD_MCOL, i); - for (j=0, l=BMIter_New(&iter, bm, BM_LOOPS_OF_FACE, f); f; j++, f=BMIter_Step(&iter)) { + for (j=0, l=BMIter_New(&iter, bm, BM_LOOPS_OF_FACE, f); l; j++, l=BMIter_Step(&iter)) { mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i); mloopcol->r = mcol[j].r; mloopcol->g = mcol[j].g; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs