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

Replace checks for tessface w/ polygons

Browse Source 
In these cases we're only checking the mesh has faces.
This commit is contained in:
Campbell Barton
2015-08-01 14:42:14 +10:00
parent c851d1d045
commit d894fcb799
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_view3d/drawobject.c
View File

@@ -4621,7 +4621,7 @@ static bool drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d,
glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
if (dt > OB_WIRE && dm->getNumTessFaces(dm)) {
if (dt > OB_WIRE && dm->getNumPolys(dm)) {
int glsl = draw_glsl_material(scene, ob, v3d, dt);
GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
@@ -7322,7 +7322,7 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
}
if (dm) {
has_faces = dm->getNumTessFaces(dm) > 0;
has_faces = (dm->getNumPolys(dm) != 0);
}
else {
has_faces = BKE_displist_has_faces(&ob->curve_cache->disp);

2
source/blender/modifiers/intern/MOD_surface.c
View File

@@ -158,7 +158,7 @@ static void deformVerts(ModifierData *md, Object *ob,
else
surmd->bvhtree = MEM_callocN(sizeof(BVHTreeFromMesh), "BVHTreeFromMesh");
if (surmd->dm->getNumTessFaces(surmd->dm))
if (surmd->dm->getNumPolys(surmd->dm))
bvhtree_from_mesh_looptri(surmd->bvhtree, surmd->dm, 0.0, 2, 6);
else
bvhtree_from_mesh_edges(surmd->bvhtree, surmd->dm, 0.0, 2, 6);