[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12915] trunk/blender/source/blender/src/ sculptmode.c: == Sculpt Mode ==

Nicholas Bishop nicholasbishop at gmail.com
Mon Dec 17 05:52:47 CET 2007


Revision: 12915
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12915
Author:   nicholasbishop
Date:     2007-12-17 05:52:46 +0100 (Mon, 17 Dec 2007)

Log Message:
-----------
== Sculpt Mode ==

Improved some memory allocation; it doesn't actually use less memory now, just avoids reallocating the same block of memory over and over again.

Modified Paths:
--------------
    trunk/blender/source/blender/src/sculptmode.c

Modified: trunk/blender/source/blender/src/sculptmode.c
===================================================================
--- trunk/blender/source/blender/src/sculptmode.c	2007-12-17 04:10:38 UTC (rev 12914)
+++ trunk/blender/source/blender/src/sculptmode.c	2007-12-17 04:52:46 UTC (rev 12915)
@@ -269,6 +269,11 @@
 
 	sculptmode_free_session(sce);
 
+	if(projverts) {
+		MEM_freeN(projverts);
+		projverts = NULL;
+	}
+
 	for(a=0; a<MAX_MTEX; a++) {
 		MTex *mtex= sd->mtex[a];
 		if(mtex) {
@@ -1563,8 +1568,9 @@
 	Mesh *me= get_mesh(OBACT);
 	unsigned i;
 
-	if(projverts) MEM_freeN(projverts);
-	projverts= MEM_mallocN(sizeof(ProjVert)*me->totvert,"ProjVerts");
+	if(!projverts)
+		projverts = MEM_mallocN(sizeof(ProjVert)*me->totvert,"ProjVerts");
+
 	for(i=0; i<me->totvert; ++i) {
 		project(vertcosnos ? &vertcosnos[i * 6] : me->mvert[i].co, projverts[i].co);
 		projverts[i].inside= 0;
@@ -1708,9 +1714,12 @@
 	ss->vertexcosnos = NULL;
 
 	/* Check that vertex users are up-to-date */
-	if(ob != active_ob || ss->vertex_users_size != get_mesh(ob)->totvert) {
+	if(ob != active_ob || !ss->vertex_users || ss->vertex_users_size != get_mesh(ob)->totvert) {
 		sculptmode_free_vertexusers(ss);
 		calc_vertex_users();
+		if(projverts)
+			MEM_freeN(projverts);
+		projverts = NULL;
 		active_ob= ob;
 	}
 		
@@ -1721,9 +1730,6 @@
 	
 	getmouseco_areawin(mvalo);
 
-	/* Make sure sculptdata has been init'd properly */
-	if(!ss->vertex_users) calc_vertex_users();
-	
 	/* Init texture
 	   FIXME: Shouldn't be doing this every time! */
 	if(sd->texrept!=SCULPTREPT_3D)
@@ -1859,8 +1865,6 @@
 		BLI_freelistN(&ss->damaged_rects);
 	}
 
-	if(projverts) MEM_freeN(projverts);
-	projverts= NULL;
 	if(e.layer_disps) MEM_freeN(e.layer_disps);
 	if(e.layer_store) MEM_freeN(e.layer_store);
 	/* Free GrabData */





More information about the Bf-blender-cvs mailing list