[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58154] trunk/blender/source/blender/bmesh /intern: BM_mesh_clear was setting toolflags incorrectly, also no meed to calloc when shrinking toolflags array.

Campbell Barton ideasman42 at gmail.com
Wed Jul 10 15:06:31 CEST 2013


Revision: 58154
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58154
Author:   campbellbarton
Date:     2013-07-10 13:06:31 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
BM_mesh_clear was setting toolflags incorrectly, also no meed to calloc when shrinking toolflags array.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
    trunk/blender/source/blender/bmesh/intern/bmesh_operators.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c	2013-07-10 12:37:15 UTC (rev 58153)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c	2013-07-10 13:06:31 UTC (rev 58154)
@@ -240,7 +240,7 @@
 	bm_mempool_init(bm, &bm_mesh_allocsize_default);
 
 	bm->stackdepth = 1;
-	bm->totflags = 1;
+	bm->totflags = 0;
 
 	CustomData_reset(&bm->vdata);
 	CustomData_reset(&bm->edata);

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-07-10 12:37:15 UTC (rev 58153)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-07-10 13:06:31 UTC (rev 58154)
@@ -1248,7 +1248,7 @@
 			/* now go through and memcpy all the flag */
 			BM_ITER_MESH_INDEX (ele, &iter, bm, BM_VERTS_OF_MESH, i) {
 				void *oldflags = ele->oflags;
-				ele->oflags = BLI_mempool_calloc(newpool);
+				ele->oflags = BLI_mempool_alloc(newpool);
 				memcpy(ele->oflags, oldflags, new_totflags_size);
 				BM_elem_index_set(ele, i); /* set_inline */
 				BM_ELEM_API_FLAG_CLEAR((BMElemF *)ele);
@@ -1264,7 +1264,7 @@
 
 			BM_ITER_MESH_INDEX (ele, &iter, bm, BM_EDGES_OF_MESH, i) {
 				void *oldflags = ele->oflags;
-				ele->oflags = BLI_mempool_calloc(newpool);
+				ele->oflags = BLI_mempool_alloc(newpool);
 				memcpy(ele->oflags, oldflags, new_totflags_size);
 				BM_elem_index_set(ele, i); /* set_inline */
 				BM_ELEM_API_FLAG_CLEAR((BMElemF *)ele);
@@ -1280,7 +1280,7 @@
 
 			BM_ITER_MESH_INDEX (ele, &iter, bm, BM_FACES_OF_MESH, i) {
 				void *oldflags = ele->oflags;
-				ele->oflags = BLI_mempool_calloc(newpool);
+				ele->oflags = BLI_mempool_alloc(newpool);
 				memcpy(ele->oflags, oldflags, new_totflags_size);
 				BM_elem_index_set(ele, i); /* set_inline */
 				BM_ELEM_API_FLAG_CLEAR((BMElemF *)ele);




More information about the Bf-blender-cvs mailing list