From 951a4934b08ab2621a627b1adb74cdf518c53a19 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 26 Jul 2005 02:44:59 +0000 Subject: - added wave modifier & removed old wave effect - added decimate modifier & removed old decimate interface (currently lacks warning about destroying data, and there needs to be a way for modifiers to return errors back to the interface) - allow applyModifier to return NULL to indicate error - unfortunately new decimate modifier means it does not know exact number of faces in mesh (other modifiers may come before) and so instead interface uses a percentage. if people need exact face count slider then I will have to think of some hack to fit this in. note that it does display the output face count so its possible to tweak the pct to get what you want regardless. - removed python Wave object If you are bored now how much easier it is to implement something like decimate as a modifier. Very few changes to interface, very few entry points. --- source/blender/src/drawobject.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'source/blender/src/drawobject.c') diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 0e8be4cedcb..328683070d0 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -1752,28 +1752,7 @@ static void draw_mesh_fancy(Object *ob, DerivedMesh *baseDM, DerivedMesh *dm, in // Unwanted combination. if (G.f&G_FACESELECT) draw_wire = 0; - // This is only for objects from the decimator and - // is a temporal solution, a reconstruction of the - // displist system should take care of it (zr/ton) - if(me->decimated) { - DispListMesh *dlm = me->decimated; - MVert *mvert= dlm->mvert; - MFace *mface= dlm->mface; - int i; - - for (i=0; itotface; i++, mface++) { - glBegin(GL_LINE_LOOP); - glVertex3fv(mvert[mface->v1].co); - glVertex3fv(mvert[mface->v2].co); - if (mface->v3) { - glVertex3fv(mvert[mface->v3].co); - if (mface->v4) - glVertex3fv(mvert[mface->v4].co); - } - glEnd(); - } - } - else if(dt==OB_BOUNDBOX) { + if(dt==OB_BOUNDBOX) { draw_bounding_volume(ob); } else if(hasHaloMat || (me->totface==0 && (!me->medge || me->totedge==0))) { -- cgit v1.2.3