[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27984] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Use DerivedMesh-> getNumFaces function in drawSolidSelect() if curve

[Sergey Sharybin]

Revision: 27984
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27984
Author:   nazgul
Date:     2010-04-04 13:07:42 +0200 (Sun, 04 Apr 2010)

Log Message:
-----------
Use DerivedMesh->getNumFaces function in drawSolidSelect() if curve
object has got derived mesh.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-04-04 11:07:34 UTC (rev 27983)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-04-04 11:07:42 UTC (rev 27984)
@@ -5329,8 +5329,15 @@
 	if(ELEM3(ob->type, OB_FONT,OB_CURVE, OB_SURF)) {
 		Curve *cu = ob->data;
 		DerivedMesh *dm = ob->derivedFinal;
+		int hasfaces= 0;
 
-		if (displist_has_faces(&cu->disp) && boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
+		if (dm) {
+			hasfaces= dm->getNumFaces(dm);
+		} else {
+			hasfaces= displist_has_faces(&cu->disp);
+		}
+
+		if (hasfaces && boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
 			draw_index_wire= 0;
 			if (dm) {
 				draw_mesh_object_outline(v3d, ob, dm);