[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44127] branches/bmesh/blender/source/ blender: * correct bad pointer check in expand_local_mesh()

[Campbell Barton]

Revision: 44127
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44127
Author:   campbellbarton
Date:     2012-02-15 14:40:45 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
* correct bad pointer check in expand_local_mesh()
* check total polygons rather then faces in draw_mesh_object()

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2012-02-15 14:39:18 UTC (rev 44126)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2012-02-15 14:40:45 UTC (rev 44127)
@@ -538,7 +538,7 @@
 {
 	id_lib_extern((ID *)me->texcomesh);
 
-	if(me->mtface) {
+	if(me->mtface || me->mtpoly) {
 		int a, i;
 
 		for(i=0; i<me->pdata.totlayer; i++) {

Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c	2012-02-15 14:39:18 UTC (rev 44126)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c	2012-02-15 14:40:45 UTC (rev 44127)
@@ -3502,7 +3502,7 @@
 	}
 	else {
 		/* don't create boundbox here with mesh_get_bb(), the derived system will make it, puts deformed bb's OK */
-		if(me->totface<=4 || ED_view3d_boundbox_clip(rv3d, ob->obmat, (ob->bb)? ob->bb: me->bb)) {
+		if(me->totpoly <= 4 || ED_view3d_boundbox_clip(rv3d, ob->obmat, (ob->bb)? ob->bb: me->bb)) {
 			glsl = draw_glsl_material(scene, ob, v3d, dt);
 			check_alpha = check_alpha_pass(base);