archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- adapt to reprototyping in BKE_DerivedMesh.h

Browse Source
This commit is contained in:
Daniel Dunbar
2005-03-31 15:57:18 +00:00
parent 9c91e1a954
commit d4b9ace5ae
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/src/drawobject.c
View File

@@ -1692,7 +1692,7 @@ static void draw_mesh_fancy(Object *ob, DerivedMesh *baseDM, DerivedMesh *realDM
Material *ma= give_current_material(ob, 1); Material *ma= give_current_material(ob, 1);
int hasHaloMat = (ma && (ma->mode&MA_HALO)); int hasHaloMat = (ma && (ma->mode&MA_HALO));
int draw_wire = ob->dtx&OB_DRAWWIRE; int draw_wire = ob->dtx&OB_DRAWWIRE;
DispList *dl, *obDL = ob->disp.first; DispList *dl;
float *obExtVerts; float *obExtVerts;
DerivedMesh *dm = realDM?realDM:baseDM; DerivedMesh *dm = realDM?realDM:baseDM;
@@ -3711,10 +3711,8 @@ void draw_object_ext(Base *base)
/* ***************** BACKBUF SEL (BBS) ********* */ /* ***************** BACKBUF SEL (BBS) ********* */
static int bbs_mesh_verts__setDrawOptions(void *userData, void *vert) static int bbs_mesh_verts__setDrawOptions(void *userData, EditVert *eve)
{ {
EditVert *eve = vert;
if (eve->h==0) { if (eve->h==0) {
set_framebuffer_index_color((int) eve->prev); set_framebuffer_index_color((int) eve->prev);
return 1; return 1;
@@ -3739,10 +3737,8 @@ static int bbs_mesh_verts(DerivedMesh *dm, int offset)
return offset; return offset;
} }
static int bbs_mesh_wire__setDrawOptions(void *userData, void *edge) static int bbs_mesh_wire__setDrawOptions(void *userData, EditEdge *eed)
{ {
EditEdge *eed = edge;
if (eed->h==0) { if (eed->h==0) {
set_framebuffer_index_color((int) eed->vn); set_framebuffer_index_color((int) eed->vn);
return 1; return 1;
@@ -3762,10 +3758,8 @@ static int bbs_mesh_wire(DerivedMesh *dm, int offset)
return offset; return offset;
} }
static int bbs_mesh_solid__setDrawOptions(void *userData, void *face) static int bbs_mesh_solid__setDrawOptions(void *userData, EditFace *efa)
{ {
EditFace *efa = face;
if (efa->h==0) { if (efa->h==0) {
set_framebuffer_index_color((int) efa->prev); set_framebuffer_index_color((int) efa->prev);
return 1; return 1;