diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 17:08:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 17:08:26 +0400 |
| commit | 7e7d28e3ad433285c205c4f44218b5b4c862c9ef (patch) | |
| tree | ffde8d085929c0cdcc150212adaa6dbdc2d10780 /source/blender/blenkernel | |
| parent | 6701933f5ce4598d2fc98bd27a5b8a4e58ca06e2 (diff) | |
fix [#31048] converting curve object to mesh makes object disapper from 3D view
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index ee18c93b943..2dc95effdd7 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -412,8 +412,9 @@ static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges 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)) - && (drawLooseEdges || !(medge->flag&ME_LOOSEEDGE))) { + if ((drawAllEdges || (medge->flag & ME_EDGEDRAW)) && + (drawLooseEdges || !(medge->flag & ME_LOOSEEDGE))) + { glVertex3fv(mvert[medge->v1].co); glVertex3fv(mvert[medge->v2].co); } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index b7b9f6b21f4..b80b15e57f3 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1224,7 +1224,10 @@ int nurbs_to_mdata(Object *ob, MVert **allvert, int *totvert, int *totloop, int *totpoly) { return nurbs_to_mdata_customdb(ob, &ob->disp, - allvert, totvert, alledge, totedge, allloop, allpoly, totloop, totpoly); + allvert, totvert, + alledge, totedge, + allloop, allpoly, + totloop, totpoly); } /* BMESH: this doesn't calculate all edges from polygons, @@ -1232,9 +1235,11 @@ int nurbs_to_mdata(Object *ob, MVert **allvert, int *totvert, /* Initialize mverts, medges and, faces for converting nurbs to mesh and derived mesh */ /* use specified dispbase */ -int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int *_totvert, - MEdge **alledge, int *_totedge, MLoop **allloop, MPoly **allpoly, - int *_totloop, int *_totpoly) +int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, + MVert **allvert, int *_totvert, + MEdge **alledge, int *_totedge, + MLoop **allloop, MPoly **allpoly, + int *_totloop, int *_totpoly) { DispList *dl; Curve *cu; @@ -1316,7 +1321,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int for (b=1; b<dl->nr; b++) { medge->v1= startvert+ofs+b-1; medge->v2= startvert+ofs+b; - medge->flag = ME_LOOSEEDGE|ME_EDGERENDER; + medge->flag = ME_LOOSEEDGE | ME_EDGERENDER | ME_EDGEDRAW; medge++; } @@ -1341,7 +1346,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int medge->v1= startvert+ofs+b; if (b==dl->nr-1) medge->v2= startvert+ofs; else medge->v2= startvert+ofs+b+1; - medge->flag = ME_LOOSEEDGE|ME_EDGERENDER; + medge->flag = ME_LOOSEEDGE | ME_EDGERENDER | ME_EDGEDRAW; medge++; } } @@ -1466,7 +1471,7 @@ void nurbs_to_mesh(Object *ob) cu= ob->data; if (dm == NULL) { - if (nurbs_to_mdata (ob, &allvert, &totvert, &alledge, &totedge, &allloop, &allpoly, &totloop, &totpoly) != 0) { + if (nurbs_to_mdata(ob, &allvert, &totvert, &alledge, &totedge, &allloop, &allpoly, &totloop, &totpoly) != 0) { /* Error initializing */ return; } |