[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43893] branches/bmesh/blender/source/ blender/blenkernel/intern: fix for error in recent commit.

[Campbell Barton]

Revision: 43893
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43893
Author:   campbellbarton
Date:     2012-02-05 07:09:30 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
fix for error in recent commit. passing totface rather then totpoly, also add asserts if PBVH attempts to build without any faces (but with polys).

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-02-05 06:20:51 UTC (rev 43892)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-02-05 07:09:30 UTC (rev 43893)
@@ -218,7 +218,7 @@
 
 		create_vert_poly_map(&cddm->pmap, &cddm->pmap_mem,
 		                     me->mpoly, me->mloop,
-		                     me->totvert, me->totface, me->totloop);
+		                     me->totvert, me->totpoly, me->totloop);
 	}
 
 	return cddm->pmap;
@@ -284,6 +284,7 @@
 		Mesh *me= ob->data;
 		cddm->pbvh = BLI_pbvh_new();
 		cddm->pbvh_draw = can_pbvh_draw(ob, dm);
+		BLI_assert(!(me->mface == NULL && me->mpoly != NULL)); /* BMESH ONLY complain if mpoly is valid but not mface */
 		BLI_pbvh_build_mesh(cddm->pbvh, me->mface, me->mvert,
 		                    me->totface, me->totvert);
 

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-02-05 06:20:51 UTC (rev 43892)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-02-05 07:09:30 UTC (rev 43893)
@@ -2747,7 +2747,7 @@
 
 		create_vert_poly_map(&ccgdm->pmap, &ccgdm->pmap_mem,
 		                     me->mpoly, me->mloop,
-		                     me->totvert, me->totface, me->totloop);
+		                     me->totvert, me->totpoly, me->totloop);
 	}
 
 	return ccgdm->pmap;
@@ -2825,6 +2825,7 @@
 	} else if(ob->type == OB_MESH) {
 		Mesh *me= ob->data;
 		ob->sculpt->pbvh= ccgdm->pbvh = BLI_pbvh_new();
+		BLI_assert(!(me->mface == NULL && me->mpoly != NULL)); /* BMESH ONLY complain if mpoly is valid but not mface */
 		BLI_pbvh_build_mesh(ccgdm->pbvh, me->mface, me->mvert,
 				   me->totface, me->totvert);
 	}