diff options
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 1 | ||||
-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, 6 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 4859c611156..addea547340 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -73,7 +73,6 @@ void mcol_to_tface(struct Mesh *me, int freedata); 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 update_realtime_texture(struct TFace *tface, double time); void mesh_delete_material_index(struct Mesh *me, int index); void mesh_set_smooth_flag(struct Object *meshOb, int enableSmooth); diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 0e280c35059..0c1de9e624d 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1443,7 +1443,7 @@ void makeDispListMesh(Object *ob) } } - if (mesh_uses_displist(me)) { /* subsurf */ + if ((me->flag&ME_SUBSURF) && me->subdiv) { if (ob==G.obedit) { G.editMesh->derived= subsurf_make_derived_from_editmesh(G.editMesh, me->subdiv, me->subsurftype, G.editMesh->derived); } else { diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 7aa5b8ca0b7..7b0e1d98750 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1193,10 +1193,6 @@ void mcol_to_tface(Mesh *me, int freedata) } } -int mesh_uses_displist(Mesh *me) { - return (me->flag&ME_SUBSURF) && me->subdiv; -} - void mesh_calculate_vertex_normals(Mesh *me) { float (*tempNorms)[3]= MEM_callocN(me->totvert*sizeof(*tempNorms), "tempNorms"); |