kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #23332: crash with screw + bevel modifiers. Since bevel doesn't support

Browse Source 
mapping yet there's still some weirdness with display of hiding/selection,
but there's another bug report open about that.
This commit is contained in:
Brecht Van Lommel 2010-08-20 16:02:20 +00:00
parent b9be82487f
commit dfb8455381
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/BME_conversions.c
View File

@ -531,6 +531,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
MFace *mface, *mf; MFace *mface, *mf;
MEdge *medge, *me; MEdge *medge, *me;
MVert *mvert, *mv; MVert *mvert, *mv;
int *origindex;
int totface,totedge,totvert,i,bmeshok,len, numTex, numCol; int totface,totedge,totvert,i,bmeshok,len, numTex, numCol;
BME_Vert *v1=NULL; BME_Vert *v1=NULL;
@ -577,13 +578,16 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
/*Make Verts*/ /*Make Verts*/
mvert = CDDM_get_verts(result); mvert = CDDM_get_verts(result);
origindex = result->getVertDataArray(result, CD_ORIGINDEX);
for(i=0,v1=bm->verts.first,mv=mvert;v1;v1=v1->next,i++,mv++){ for(i=0,v1=bm->verts.first,mv=mvert;v1;v1=v1->next,i++,mv++){
VECCOPY(mv->co,v1->co); VECCOPY(mv->co,v1->co);
mv->flag = (unsigned char)v1->flag; mv->flag = (unsigned char)v1->flag;
mv->bweight = (char)(255.0*v1->bweight); mv->bweight = (char)(255.0*v1->bweight);
CustomData_from_bmesh_block(&bm->vdata, &result->vertData, &v1->data, i); CustomData_from_bmesh_block(&bm->vdata, &result->vertData, &v1->data, i);
origindex[i] = ORIGINDEX_NONE;
} }
medge = CDDM_get_edges(result); medge = CDDM_get_edges(result);
origindex = result->getEdgeDataArray(result, CD_ORIGINDEX);
i=0; i=0;
for(e=bm->edges.first,me=medge;e;e=e->next){ for(e=bm->edges.first,me=medge;e;e=e->next){
if(e->tflag2){ if(e->tflag2){
@ -600,12 +604,14 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
me->bweight = (char)(255.0*e->bweight); me->bweight = (char)(255.0*e->bweight);
me->flag = e->flag; me->flag = e->flag;
CustomData_from_bmesh_block(&bm->edata, &result->edgeData, &e->data, i); CustomData_from_bmesh_block(&bm->edata, &result->edgeData, &e->data, i);
origindex[i] = ORIGINDEX_NONE;
me++; me++;
i++; i++;
} }
} }
if(totface){ if(totface){
mface = CDDM_get_faces(result); mface = CDDM_get_faces(result);
origindex = result->getFaceDataArray(result, CD_ORIGINDEX);
/*make faces*/ /*make faces*/
for(i=0,f=bm->polys.first;f;f=f->next){ for(i=0,f=bm->polys.first;f;f=f->next){
mf = &mface[i]; mf = &mface[i];
@ -625,6 +631,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
mf->flag = (unsigned char)f->flag; mf->flag = (unsigned char)f->flag;
CustomData_from_bmesh_block(&bm->pdata, &result->faceData, &f->data, i); CustomData_from_bmesh_block(&bm->pdata, &result->faceData, &f->data, i);
BME_DMloops_to_corners(bm, &result->faceData, i, f,numCol,numTex); BME_DMloops_to_corners(bm, &result->faceData, i, f,numCol,numTex);
origindex[i] = ORIGINDEX_NONE;
i++; i++;
} }
} }