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

== Sculpt Mode ==

Browse Source 
Removed special Sculpt Mode undo code. Sculpt Mode undo is no longer so useful, since in order to make it more correct it has gotten slower, so normal BIF_undo_push is used now. Fixes bug with Shape Keys, sculpting on a shape key wasn't doing undo properly.
This commit is contained in:
Nicholas Bishop
2007-02-27 06:22:41 +00:00
parent 6e3b4ee0d4
commit 4b0db88d3e
6 changed files with 21 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/include/BDR_sculptmode.h
View File

@@ -45,7 +45,6 @@ struct PartialVisibility;
struct Scene;
struct ScrArea;
struct SculptData;
struct SculptUndo;
typedef enum PropsetMode {
PropsetNone = 0,
@@ -82,8 +81,6 @@ typedef struct SculptSession {
PropsetData *propset;
struct SculptUndo *undo;
/* For rotating around a pivot point */
vec3f pivot;
} SculptSession;
@@ -96,19 +93,6 @@ void sculptmode_init(struct Scene *);
void sculptmode_free_all(struct Scene *);
void sculptmode_correct_state(void);
/* Undo */
typedef enum SculptUndoType {
SUNDO_VERT= 1, /* Vertex locations modified */
SUNDO_TOPO= 2, /* Any face/edge change, different # of verts, etc. */
SUNDO_PVIS= 4, /* Mesh.pv changed */
SUNDO_MRES= 8 /* Mesh.mr changed */
} SculptUndoType;
void sculptmode_undo_push(char *str, SculptUndoType type);
void sculptmode_undo(void);
void sculptmode_redo(void);
void sculptmode_undo_menu(void);
void sculptmode_undo_free(struct Scene *sce);
/* Interface */
void sculptmode_draw_interface_tools(struct uiBlock *block,unsigned short cx, unsigned short cy);
void sculptmode_draw_interface_textures(struct uiBlock *block,unsigned short cx, unsigned short cy);

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

@@ -1260,9 +1260,6 @@ static void modifiers_applyModifier(void *obv, void *mdv)
BLI_remlink(&ob->modifiers, md);
modifier_free(md);
if(G.f & G_SCULPTMODE)
sculptmode_undo_push("Apply modifier", SUNDO_VERT|SUNDO_TOPO|SUNDO_PVIS|SUNDO_MRES);
else
BIF_undo_push("Apply modifier");
}
}

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

@@ -1696,9 +1696,6 @@ void exit_editmode(int flag) /* freedata==0 at render, 1= freedata, 2= do undo b
allqueue(REDRAWIMAGE, 0);
if(G.f & G_WEIGHTPAINT)
mesh_octree_table(G.obedit, NULL, 'e');
/* to be sure, adding/removing data crashes undo for sculpt (ton) */
if(G.f & G_SCULPTMODE)
sculptmode_undo_free(G.scene);
}
else if (G.obedit->type==OB_ARMATURE){
load_editArmature();

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

@@ -106,14 +106,6 @@ void multires_check_state()
sculptmode_correct_state();
}
void multires_undo_push(char *str)
{
if(G.f & G_SCULPTMODE && !G.obedit)
sculptmode_undo_push(str, SUNDO_VERT | SUNDO_TOPO | SUNDO_PVIS | SUNDO_MRES);
else
BIF_undo_push(str);
}
typedef struct MultiresMapNode {
struct MultiresMapNode *next, *prev;
unsigned Index;
@@ -619,7 +611,7 @@ void multires_make(void *ob, void *me_v)
allqueue(REDRAWBUTSEDIT, 0);
multires_undo_push("Make multires");
BIF_undo_push("Make multires");
waitcursor(0);
}
@@ -634,7 +626,7 @@ void multires_delete(void *ob, void *me_v)
allqueue(REDRAWBUTSEDIT, 0);
multires_undo_push("Apply multires");
BIF_undo_push("Apply multires");
}
MultiresLevel *multires_level_copy(MultiresLevel *orig)
@@ -785,7 +777,7 @@ void multires_del_lower(void *ob, void *me)
allqueue(REDRAWBUTSEDIT, 0);
multires_undo_push("Multires delete lower");
BIF_undo_push("Multires delete lower");
}
void multires_del_higher(void *ob, void *me)
@@ -812,7 +804,7 @@ void multires_del_higher(void *ob, void *me)
allqueue(REDRAWBUTSEDIT, 0);
multires_undo_push("Multires delete higher");
BIF_undo_push("Multires delete higher");
}
unsigned int find_mid_edge(ListBase *vert_edge_map,
@@ -1014,7 +1006,7 @@ void multires_add_level(void *ob, void *me_v)
allqueue(REDRAWBUTSEDIT, 0);
multires_undo_push("Add multires level");
BIF_undo_push("Add multires level");
waitcursor(0);
}
@@ -1039,7 +1031,7 @@ void multires_set_level(void *ob, void *me_v)
multires_level_to_mesh(ob,me);
if(G.obedit || G.f & G_SCULPTMODE)
multires_undo_push("Multires set level");
BIF_undo_push("Multires set level");
allqueue(REDRAWBUTSEDIT, 0);

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

@@ -211,14 +211,12 @@ void sculptmode_init(Scene *sce)
sd->tablet_strength=10;
}
void sculptmode_undo_init();
void sculptmode_free_session(Scene *);
void sculpt_init_session(void)
{
if(sculpt_data()->session)
sculptmode_free_session(G.scene);
sculpt_data()->session= MEM_callocN(sizeof(SculptSession), "SculptSession");
sculptmode_undo_init();
}
void sculptmode_free_vertexusers(SculptSession *ss)
@@ -232,330 +230,6 @@ void sculptmode_free_vertexusers(SculptSession *ss)
}
}
typedef struct SculptUndoStep {
struct SculptUndoStep *next, *prev;
SculptUndoType type;
char *str;
MVert *verts;
MEdge *edges;
MFace *faces;
int totvert, totedge, totface;
PartialVisibility *pv;
Multires *mr;
} SculptUndoStep;
typedef struct SculptUndo {
ListBase steps;
SculptUndoStep *cur;
} SculptUndo;
void sculptmode_undo_debug_print_type(SculptUndoType t)
{
if(t & SUNDO_VERT) printf("VERT,");
if(t & SUNDO_TOPO) printf("TOPO,");
if(t & SUNDO_PVIS) printf("PVIS,");
if(t & SUNDO_MRES) printf("MRES,");
}
void sculptmode_undo_push_debug_print()
{
SculptUndo *su= sculpt_session()->undo;
if(su) {
int i;
SculptUndoStep *sus;
for(i=1, sus= su->steps.first; sus; ++i, sus= sus->next) {
printf("%d(%p): ",i,sus);
if(sus == su->cur) printf("A");
else printf("-");
printf(" type(");
sculptmode_undo_debug_print_type(sus->type);
printf(") v(%p) f/e/vc/fc/ec(%p,%p,%d,%d,%d) pv(%p) name(%s)\n",sus->verts,sus->faces,sus->edges,sus->totvert,sus->totface,sus->totedge,sus->pv,sus->str);
}
}
else
printf("No undo data");
printf("\n");
}
void sculptmode_undo_init()
{
sculpt_session()->undo= MEM_callocN(sizeof(SculptUndo), "Sculpt Undo");
sculptmode_undo_push("Original", SUNDO_VERT|SUNDO_TOPO|SUNDO_PVIS|SUNDO_MRES);
}
void sculptmode_undo_free_link(SculptUndoStep *sus)
{
if(sus->verts)
MEM_freeN(sus->verts);
if(sus->edges)
MEM_freeN(sus->edges);
if(sus->faces)
MEM_freeN(sus->faces);
if(sus->pv)
sculptmode_pmv_free(sus->pv);
if(sus->mr)
multires_free(sus->mr);
}
void sculptmode_undo_pull_chopped(SculptUndoStep *sus)
{
SculptUndoStep *f;
for(f= sus; f && !(sus->type & SUNDO_TOPO); f= f->prev)
if(f->type & SUNDO_TOPO) {
sus->edges= f->edges;
f->edges= NULL;
sus->faces= f->faces;
f->faces= NULL;
sus->totvert= f->totvert;
sus->totedge= f->totedge;
sus->totface= f->totface;
sus->type |= SUNDO_TOPO;
break;
}
for(f= sus; f && !(sus->type & SUNDO_PVIS); f= f->prev)
if(f->type & SUNDO_PVIS) {
sus->pv= f->pv;
f->pv= NULL;
sus->type |= SUNDO_PVIS;
break;
}
for(f= sus; f && !(sus->type & SUNDO_MRES); f= f->prev)
if(f->type & SUNDO_MRES) {
sus->mr= f->mr;
f->mr= NULL;
sus->type |= SUNDO_MRES;
break;
}
}
/* also called now after leave mesh editmode. prevent crashing when data amount changes */
void sculptmode_undo_free(Scene *sce)
{
SculptSession *ss= sce->sculptdata.session;
SculptUndoStep *sus;
if(ss && ss->undo) {
for(sus= ss->undo->steps.first; sus; sus= sus->next)
sculptmode_undo_free_link(sus);
BLI_freelistN(&ss->undo->steps);
MEM_freeN(ss->undo);
ss->undo= NULL;
}
}
void sculptmode_undo_push(char *str, SculptUndoType type)
{
SculptSession *ss= sculpt_session();
int cnt= U.undosteps-1;
SculptUndo *su= ss->undo;
SculptUndoStep *n, *sus, *chop, *path;
Mesh *me= get_mesh(OBACT);
if(U.undosteps==0) {
sculptmode_undo_free(G.scene);
return;
}
n= MEM_callocN(sizeof(SculptUndoStep), "SculptUndo");
/* Chop off undo data after cur */
for(sus= su->steps.last; sus && sus != su->cur; sus= path) {
path= sus->prev;
sculptmode_undo_free_link(sus);
BLI_freelinkN(&su->steps, sus);
}
/* Initialize undo data */
n->type= type;
n->str= str;
if(type & SUNDO_VERT)
n->verts= MEM_dupallocN(me->mvert);
if(type & SUNDO_TOPO) {
n->edges= MEM_dupallocN(me->medge);
n->faces= MEM_dupallocN(me->mface);
n->totvert= me->totvert;
n->totedge= me->totedge;
n->totface= me->totface;
}
if(type & SUNDO_PVIS) {
if(me->pv)
n->pv= sculptmode_copy_pmv(me->pv);
}
if(type & SUNDO_MRES) {
if(me->mr)
n->mr= multires_copy(me->mr);
}
/* Add new undo step */
BLI_addtail(&su->steps, n);
/* Chop off undo steps pass MAXSZ */
for(chop= su->steps.last; chop && cnt; chop= chop->prev, --cnt);
if(!cnt && chop) {
/* Make sure that non-vert data isn't lost */
sculptmode_undo_pull_chopped(chop);
for(sus= su->steps.first; sus && sus != chop; sus= path) {
path= sus->next;
sculptmode_undo_free_link(sus);
BLI_freelinkN(&su->steps, sus);
}
}
su->cur= n;
}
void sculptmode_undo_update(SculptUndoStep *newcur)
{
SculptSession *ss= sculpt_session();
SculptUndoStep *oldcur= ss->undo->cur, *sus;
Object *ob= OBACT;
Mesh *me= get_mesh(ob);
int forward= 0;
SculptUndoType type= SUNDO_VERT;
/* No update if undo step hasn't changed */
if(newcur == oldcur) return;
/* Discover direction of undo */
for(sus= oldcur; sus && sus != newcur; sus= sus->next);
if(sus == newcur) forward= 1;
active_ob= NULL;
/* Verts */
if(newcur->verts) {
CustomData_free_layer_active(&me->vdata, CD_MVERT, me->totvert);
me->mvert= MEM_dupallocN(newcur->verts);
CustomData_add_layer(&me->vdata, CD_MVERT, CD_ASSIGN, me->mvert, newcur->totvert);
}
/* Check if faces/edges have been modified between oldcur and newcur */
for(sus= forward?oldcur->next:newcur->next;
sus && sus != (forward?newcur->next:oldcur->next); sus= sus->next)
if(sus->type & SUNDO_TOPO) {
type |= SUNDO_TOPO;
break;
}
for(sus= forward?oldcur->next:newcur->next;
sus && sus != (forward?newcur->next:oldcur->next); sus= sus->next)
if(sus->type & SUNDO_PVIS) {
type |= SUNDO_PVIS;
break;
}
for(sus= forward?oldcur->next:newcur->next;
sus && sus != (forward?newcur->next:oldcur->next); sus= sus->next)
if(sus->type & SUNDO_MRES) {
type |= SUNDO_MRES;
break;
}
if(type & SUNDO_TOPO)
for(sus= newcur; sus; sus= sus->prev) {
if(sus->type & SUNDO_TOPO) {
CustomData_free_layer_active(&me->edata, CD_MEDGE, me->totedge);
CustomData_free_layer_active(&me->fdata, CD_MFACE, me->totface);
me->medge= MEM_dupallocN(sus->edges);
me->mface= MEM_dupallocN(sus->faces);
CustomData_add_layer(&me->edata, CD_MEDGE, CD_ASSIGN, me->medge, sus->totedge);
CustomData_add_layer(&me->fdata, CD_MFACE, CD_ASSIGN, me->mface, sus->totface);
me->totvert= sus->totvert;
me->totedge= sus->totedge;
me->totface= sus->totface;
break;
}
}
if(type & SUNDO_PVIS)
for(sus= newcur; sus; sus= sus->prev)
if(sus->type & SUNDO_PVIS) {
if(me->pv)
sculptmode_pmv_free(me->pv);
me->pv= NULL;
if(sus->pv)
me->pv= sculptmode_copy_pmv(sus->pv);
break;
}
if(type & SUNDO_MRES)
for(sus= newcur; sus; sus= sus->prev)
if(sus->type & SUNDO_MRES) {
if(me->mr)
multires_free(me->mr);
me->mr= NULL;
if(sus->mr)
me->mr= multires_copy(sus->mr);
break;
}
ss->undo->cur= newcur;
if(!(sculpt_data()->draw_flag & SCULPTDRAW_FAST) || sculpt_modifiers_active(ob))
DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
if(G.vd->depths) G.vd->depths->damaged= 1;
allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWBUTSEDIT, 0);
}
void sculptmode_undo(void)
{
SculptUndo *su= sculpt_session()->undo;
if(su && su->cur->prev)
sculptmode_undo_update(su->cur->prev);
}
void sculptmode_redo(void)
{
SculptUndo *su= sculpt_session()->undo;
if(su && su->cur->next)
sculptmode_undo_update(su->cur->next);
}
void sculptmode_undo_menu(void)
{
SculptUndo *su= sculpt_session()->undo;
SculptUndoStep *sus;
DynStr *ds= BLI_dynstr_new();
char *menu;
if(!su) return;
BLI_dynstr_append(ds, "Sculpt Mode Undo History %t");
for(sus= su->steps.first; sus; sus= sus->next) {
BLI_dynstr_append(ds, "|");
BLI_dynstr_append(ds, sus->str);
}
menu= BLI_dynstr_get_cstring(ds);
BLI_dynstr_free(ds);
if(menu) {
short event= pupmenu_col(menu, 20);
MEM_freeN(menu);
if(event>0) {
int a= 1;
for(sus= su->steps.first; sus; sus= sus->next, a++)
if(a==event) break;
sculptmode_undo_update(sus);
}
}
}
void sculptmode_propset_end(int);
void sculptmode_free_session(Scene *sce)
{
@@ -564,7 +238,6 @@ void sculptmode_free_session(Scene *sce)
sculptmode_free_vertexusers(ss);
if(ss->texcache)
MEM_freeN(ss->texcache);
sculptmode_undo_free(sce);
sculptmode_propset_end(1);
MEM_freeN(ss);
sce->sculptdata.session= NULL;
@@ -1834,7 +1507,6 @@ void sculptmode_correct_state(void)
glEnableClientState(GL_NORMAL_ARRAY);
if(!sculpt_session()->vertex_users) calc_vertex_users();
if(!sculpt_session()->undo) sculptmode_undo_init();
}
/* Checks whether full update mode (slower) needs to be used to work with modifiers */
@@ -1896,7 +1568,6 @@ void sculpt(void)
/* Make sure sculptdata has been init'd properly */
if(!ss->vertex_users) calc_vertex_users();
if(!ss->undo) sculptmode_undo_init();
/* Init texture
FIXME: Shouldn't be doing this every time! */
@@ -2048,19 +1719,19 @@ void sculpt(void)
switch(G.scene->sculptdata.brush_type) {
case DRAW_BRUSH:
sculptmode_undo_push("Draw Brush", SUNDO_VERT); break;
BIF_undo_push("Draw Brush"); break;
case SMOOTH_BRUSH:
sculptmode_undo_push("Smooth Brush", SUNDO_VERT); break;
BIF_undo_push("Smooth Brush"); break;
case PINCH_BRUSH:
sculptmode_undo_push("Pinch Brush", SUNDO_VERT); break;
BIF_undo_push("Pinch Brush"); break;
case INFLATE_BRUSH:
sculptmode_undo_push("Inflate Brush", SUNDO_VERT); break;
BIF_undo_push("Inflate Brush"); break;
case GRAB_BRUSH:
sculptmode_undo_push("Grab Brush", SUNDO_VERT); break;
BIF_undo_push("Grab Brush"); break;
case LAYER_BRUSH:
sculptmode_undo_push("Layer Brush", SUNDO_VERT); break;
BIF_undo_push("Layer Brush"); break;
default:
sculptmode_undo_push("Sculpting", SUNDO_VERT); break;
BIF_undo_push("Sculpting"); break;
}
if(G.vd->depths) G.vd->depths->damaged= 1;
@@ -2385,7 +2056,7 @@ void sculptmode_pmv(int mode)
scrarea_do_windraw(curarea);
sculptmode_undo_push("Partial mesh hide", SUNDO_VERT|SUNDO_TOPO|SUNDO_PVIS);
BIF_undo_push("Partial mesh hide");
waitcursor(0);
}

10
source/blender/src/space.c
View File

@@ -866,8 +866,6 @@ void BIF_undo_push(char *str)
else if (G.obedit->type==OB_ARMATURE)
undo_push_armature(str);
}
else if(G.f & G_SCULPTMODE) {
}
else {
if(U.uiflag & USER_GLOBALUNDO)
BKE_write_undo(str);
@@ -883,8 +881,6 @@ void BIF_undo(void)
else {
if(G.f & G_TEXTUREPAINT)
imagepaint_undo();
else if(G.f & G_SCULPTMODE)
sculptmode_undo();
else if(curarea->spacetype==SPACE_IMAGE && (G.sima->flag & SI_DRAWTOOL))
imagepaint_undo();
else {
@@ -906,8 +902,6 @@ void BIF_redo(void)
else {
if(G.f & G_TEXTUREPAINT)
imagepaint_undo();
else if(G.f & G_SCULPTMODE)
sculptmode_redo();
else if(curarea->spacetype==SPACE_IMAGE && (G.sima->flag & SI_DRAWTOOL))
imagepaint_undo();
else {
@@ -927,9 +921,6 @@ void BIF_undo_menu(void)
undo_editmode_menu();
allqueue(REDRAWALL, 0);
}
else {
if(G.f & G_SCULPTMODE)
sculptmode_undo_menu();
else {
if(U.uiflag & USER_GLOBALUNDO) {
char *menu= BKE_undo_menu_string();
@@ -940,7 +931,6 @@ void BIF_undo_menu(void)
}
}
}
}
}
/* *************** */