diff options
author | Daniel Dunbar <daniel@zuster.org> | 2004-01-08 07:42:29 +0300 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2004-01-08 07:42:29 +0300 |
commit | f6f06ba54d5195c8c0eac0e0b59d615ba20d1349 (patch) | |
tree | 83208edf3648cab2b05406dfb521ff08b8bbd69f /source/blender/blenkernel | |
parent | 86e32ddcc88c3e048105ad4f055fa1ad84aae152 (diff) |
- removed duplicate flags from BKE_mesh.h
- removed rendermesh_uses_displist (no longer relevant)
- converted appropriate me->flag tests to using mesh_uses_displist
- made vert and face counting (for info header) use proper counts
- changed flip_subdivision to allow level==0 argument
- ps. thanks for subsurf orco fix ton
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 33 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 4 |
3 files changed, 1 insertions, 38 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 500e1b0ef00..f7d3f4863bc 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -34,38 +34,6 @@ #ifndef BKE_MESH_H #define BKE_MESH_H -/* texflag */ -#define AUTOSPACE 1 - -/* me->flag (let op alternatieven in blendpsx.h) */ -#define ME_ISDONE 1 -#define ME_NOPUNOFLIP 2 -#define ME_TWOSIDED 4 -#define ME_UVEFFECT 8 -#define ME_VCOLEFFECT 16 -#define ME_AUTOSMOOTH 32 -#define ME_SMESH 64 -#define ME_SUBSURF 128 - -/* puno (mface) */ -#define ME_FLIPV1 1 -#define ME_FLIPV2 2 -#define ME_FLIPV3 4 -#define ME_FLIPV4 8 -#define ME_PROJXY 16 -#define ME_PROJXZ 32 -#define ME_PROJYZ 64 - -/* edcode (mface) */ -#define ME_V1V2 1 -#define ME_V2V3 2 -#define ME_V3V1 4 -#define ME_V3V4 4 -#define ME_V4V1 8 - -/* flag (mface) */ -#define ME_SMOOTH 1 - /***/ struct DispList; @@ -105,7 +73,6 @@ void tface_to_mcol(struct Mesh *me); void free_dverts(struct MDeformVert *dvert, int totvert); void copy_dverts(struct MDeformVert *dst, struct MDeformVert *src, int totvert); /* __NLA */ int mesh_uses_displist(struct Mesh *me); -int rendermesh_uses_displist(struct Mesh *me); float get_mvert_weight (struct Object *ob, int vert, int defgroup); int update_realtime_texture(struct TFace *tface, double time); diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 53f94a5e6c6..51c24d5d469 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1646,7 +1646,7 @@ void makeDispList(Object *ob) if(ob->effect.first) object_wave(ob); - if (me->flag & ME_SUBSURF) { + if (mesh_uses_displist(me)) { DispListMesh *dlm; if (ob==G.obedit) { diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 66025473fde..8313c4bbf93 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1111,10 +1111,6 @@ int mesh_uses_displist(Mesh *me) { return (me->flag&ME_SUBSURF); } -int rendermesh_uses_displist(Mesh *me) { - return (me->flag&ME_SUBSURF); -} - void mesh_calculate_vertex_normals(Mesh *me) { float (*tempNorms)[3]= MEM_callocN(me->totvert*sizeof(*tempNorms), "tempNorms"); |