[Bf-blender-cvs] [d894fcb] master: Replace checks for tessface w/ polygons

[Campbell Barton]

Commit: d894fcb79972e5475ec1b301f2be794ef53dda3d
Author: Campbell Barton
Date:   Sat Aug 1 14:42:14 2015 +1000
Branches: master
https://developer.blender.org/rBd894fcb79972e5475ec1b301f2be794ef53dda3d

Replace checks for tessface w/ polygons

In these cases we're only checking the mesh has faces.

===================================================================

M       source/blender/editors/space_view3d/drawobject.c
M       source/blender/modifiers/intern/MOD_surface.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawobject.c 
b/source/blender/editors/space_view3d/drawobject.c
index f03b008..82acc58 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -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);
diff --git a/source/blender/modifiers/intern/MOD_surface.c 
b/source/blender/modifiers/intern/MOD_surface.c
index abb652c..ff5e5f6 100644
--- a/source/blender/modifiers/intern/MOD_surface.c
+++ b/source/blender/modifiers/intern/MOD_surface.c
@@ -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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs