diff options
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index b7f068c936b..aab39a099bf 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -87,6 +87,8 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +//XXX #include "multires.h" +// #include "GPU_draw.h" #include "GPU_extensions.h" #include "GPU_material.h" @@ -627,7 +629,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us if(draw) { if (draw==2) { /* enabled with stipple */ glEnable(GL_POLYGON_STIPPLE); - glPolygonStipple(stipple_quarttone); + glPolygonStipple(0); //XXX stipple_quarttone); } glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); @@ -664,7 +666,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us if(draw) { if (draw==2) { /* enabled with stipple */ glEnable(GL_POLYGON_STIPPLE); - glPolygonStipple(stipple_quarttone); + glPolygonStipple(0); //XXX stipple_quarttone); } glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); @@ -1706,12 +1708,12 @@ static void vDM_drawVerts(DerivedMesh *dm) vvert = vdm->vertex_layer->dl.lb.first; - bglBegin(GL_POINTS); + //XXX bglBegin(GL_POINTS); while(vvert) { - bglVertex3fv(vdm->vertexCos ? vvert->cos : vvert->co); + //XXX bglVertex3fv(vdm->vertexCos ? vvert->cos : vvert->co); vvert = vvert->next; } - bglEnd(); + //XXX bglEnd(); } /* draw all edges of VerseFaces ... it isn't optimal, because verse @@ -2816,18 +2818,18 @@ float *multires_render_pin(Object *ob, Mesh *me, int *orig_lvl) int i; /* Make sure all mesh edits are properly stored in the multires data*/ - multires_update_levels(me, 1); + //XXX multires_update_levels(me, 1); /* Copy the highest level of multires verts */ *orig_lvl= me->mr->current; - lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels)); + //XXX lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels)); vert_copy= MEM_callocN(sizeof(float)*3*lvl->totvert, "multires vert_copy"); for(i=0; i<lvl->totvert; ++i) VecCopyf(&vert_copy[i*3], me->mr->verts[i].co); /* Goto the pin level for multires */ me->mr->newlvl= me->mr->pinlvl; - multires_set_level(ob, me, 1); + //XXX multires_set_level(ob, me, 1); } return vert_copy; @@ -2840,7 +2842,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c if(me->mr && !(me->mr->flag & MULTIRES_NO_RENDER)) { if((*dm)->getNumVerts(*dm) == me->totvert && (*dm)->getNumFaces(*dm) == me->totface) { - MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels)); + //XXX MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels)); DerivedMesh *old= NULL; MVert *vertdup= NULL; int i; @@ -2854,7 +2856,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c MEM_freeN(vertdup); /* Go to the render level */ me->mr->newlvl= me->mr->renderlvl; - multires_set_level(ob, me, 1); + //XXX multires_set_level(ob, me, 1); (*dm)= getMeshDerivedMesh(me, ob, NULL); /* Some of the data in dm is referenced externally, so make a copy */ @@ -2867,16 +2869,16 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c /* Restore the original verts */ me->mr->newlvl= BLI_countlist(&me->mr->levels); - multires_set_level(ob, me, 1); - for(i=0; i<lvl->totvert; ++i) - VecCopyf(me->mvert[i].co, &vert_copy[i*3]); + //XXX multires_set_level(ob, me, 1); + //XXX for(i=0; i<lvl->totvert; ++i) + //XXX VecCopyf(me->mvert[i].co, &vert_copy[i*3]); } if(vert_copy) MEM_freeN(vert_copy); me->mr->newlvl= orig_lvl; - multires_set_level(ob, me, 1); + //XXX multires_set_level(ob, me, 1); } } |