archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Modified sculptmode's vertex_users to use one large chunk of memory rather than many small pieces.

Browse Source
This commit is contained in:
Nicholas Bishop
2006-12-20 08:33:30 +00:00
parent 547be2a5ce
commit 56b79bb66e
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenloader/intern/readfile.c
View File

@@ -3105,6 +3105,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
/* SculptData */
sce->sculptdata.active_ob= NULL;
sce->sculptdata.vertex_users= NULL;
sce->sculptdata.vertex_users_mem= NULL;
sce->sculptdata.texrndr= NULL;
sce->sculptdata.propset= 0;
sce->sculptdata.undo= NULL;

4
source/blender/makesdna/DNA_scene_types.h
View File

@@ -391,6 +391,7 @@ typedef struct BrushData
struct PropsetData;
struct RenderInfo;
struct SculptUndo;
struct IndexNode;
/* DNA WARNING: use of doubles forces SculptData internal alignment to 8 (only in gcc?) */
typedef struct SculptData
@@ -410,13 +411,14 @@ typedef struct SculptData
the list for each vert contains the index
for all the faces that use that vertex */
struct ListBase *vertex_users;
struct IndexNode *vertex_users_mem;
/* Used to cache the render of the active texture */
struct RenderInfo *texrndr;
struct PropsetData *propset;
struct SculptUndo *undo, *padp; /* pointer pad! */
struct SculptUndo *undo;
/* For rotating around a pivot point */
vec3f pivot, padv; /* vec3f is 12 bytes */

3
source/blender/src/multires.c
View File

@@ -1240,7 +1240,8 @@ void multires_level_to_mesh(Object *ob, Mesh *me)
multires_edge_level_update(ob,me);
DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
set_sculpt_object(ob);
if(G.f & G_SCULPTMODE)
set_sculpt_object(ob);
}
countall();

29
source/blender/src/sculptmode.c
View File

@@ -189,12 +189,10 @@ void sculptmode_free_vertexusers(struct Scene *sce)
sd= &sce->sculptdata;
if(sd->vertex_users){
int i;
for(i=0; i<sd->vertex_users_size; ++i){
BLI_freelistN(&sd->vertex_users[i]);
}
MEM_freeN(sd->vertex_users);
MEM_freeN(sd->vertex_users_mem);
sd->vertex_users= NULL;
sd->vertex_users_mem= NULL;
sd->vertex_users_size= 0;
}
}
@@ -546,26 +544,23 @@ void sculptmode_free_all(Scene *sce)
void calc_vertex_users()
{
int i,j;
IndexNode *node= 0;
Mesh *me= get_mesh(G.scene->sculptdata.active_ob);
IndexNode *node= NULL;
SculptData *sd= &G.scene->sculptdata;
Mesh *me= get_mesh(sd->active_ob);
sculptmode_free_vertexusers(G.scene);
/* Allocate an array of ListBases, one per vertex */
G.scene->sculptdata.vertex_users= (ListBase*)MEM_mallocN(sizeof(ListBase) * me->totvert, "vertex_users");
G.scene->sculptdata.vertex_users_size= me->totvert;
/* Initialize */
for(i=0; i<me->totvert; ++i){
G.scene->sculptdata.vertex_users[i].first=G.scene->sculptdata.vertex_users[i].last= 0;
}
sd->vertex_users= (ListBase*)MEM_callocN(sizeof(ListBase) * me->totvert, "vertex_users");
sd->vertex_users_size= me->totvert;
sd->vertex_users_mem= MEM_mallocN(sizeof(IndexNode)*me->totvert*4, "vertex_users_mem");
node= sd->vertex_users_mem;
/* Find the users */
for(i=0; i<me->totface; ++i){
for(j=0; j<(me->mface[i].v4?4:3); ++j){
node= (IndexNode*)MEM_mallocN(sizeof(IndexNode), "faceindex");
for(j=0; j<(me->mface[i].v4?4:3); ++j, ++node) {
node->Index=i;
BLI_addtail(&G.scene->sculptdata.vertex_users[((unsigned int*)(&me->mface[i]))[j]], node);
BLI_addtail(&sd->vertex_users[((unsigned int*)(&me->mface[i]))[j]], node);
}
}
}