Revision: 46523
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46523
Author: nicholasbishop
Date: 2012-05-10 20:34:47 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Add undo/redo support for paint masks.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_paint.h
trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
Modified: trunk/blender/source/blender/blenkernel/BKE_paint.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_paint.h 2012-05-10 20:34:35 UTC
(rev 46522)
+++ trunk/blender/source/blender/blenkernel/BKE_paint.h 2012-05-10 20:34:47 UTC
(rev 46523)
@@ -84,6 +84,7 @@
int totvert, totpoly;
float *face_normals;
struct KeyBlock *kb;
+ float *vmask;
/* Mesh connectivity */
const struct MeshElemMap *pmap;
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
2012-05-10 20:34:35 UTC (rev 46522)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
2012-05-10 20:34:47 UTC (rev 46523)
@@ -69,7 +69,8 @@
typedef enum {
SCULPT_UNDO_COORDS,
- SCULPT_UNDO_HIDDEN
+ SCULPT_UNDO_HIDDEN,
+ SCULPT_UNDO_MASK
} SculptUndoType;
typedef struct SculptUndoNode {
@@ -83,6 +84,7 @@
float (*co)[3];
float (*orig_co)[3];
short (*no)[3];
+ float *mask;
int totvert;
/* non-multires */
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
2012-05-10 20:34:35 UTC (rev 46522)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
2012-05-10 20:34:47 UTC (rev 46523)
@@ -217,6 +217,49 @@
return 1;
}
+static int sculpt_undo_restore_mask(bContext *C, DerivedMesh *dm,
SculptUndoNode *unode)
+{
+ Object *ob= CTX_data_active_object(C);
+ SculptSession *ss= ob->sculpt;
+ MVert *mvert;
+ float *vmask;
+ int *index, i, j;
+
+ if(unode->maxvert) {
+ /* regular mesh restore */
+
+ index= unode->index;
+ mvert= ss->mvert;
+ vmask= ss->vmask;
+
+ for(i=0; i<unode->totvert; i++) {
+ SWAP(float, vmask[index[i]], unode->mask[i]);
+ mvert[index[i]].flag |= ME_VERT_PBVH_UPDATE;
+ }
+ }
+ else if(unode->maxgrid && dm->getGridData) {
+ /* multires restore */
+ CCGElem **grids, *grid;
+ CCGKey key;
+ float *mask;
+ int gridsize;
+
+ grids= dm->getGridData(dm);
+ gridsize= dm->getGridSize(dm);
+ dm->getGridKey(dm, &key);
+
+ mask = unode->mask;
+ for(j=0; j<unode->totgrid; j++) {
+ grid= grids[unode->grids[j]];
+
+ for(i=0; i<gridsize*gridsize; i++, mask++)
+ SWAP(float, *CCG_elem_offset_mask(&key, grid,
i), *mask);
+ }
+ }
+
+ return 1;
+}
+
static void sculpt_undo_restore(bContext *C, ListBase *lb)
{
Scene *scene = CTX_data_scene(C);
@@ -251,15 +294,19 @@
continue;
}
- switch (unode->type) {
+ switch(unode->type) {
case SCULPT_UNDO_COORDS:
if (sculpt_undo_restore_coords(C, dm, unode))
- update = 1;
+ update= 1;
break;
case SCULPT_UNDO_HIDDEN:
if (sculpt_undo_restore_hidden(C, dm, unode))
- rebuild = 1;
+ rebuild= 1;
break;
+ case SCULPT_UNDO_MASK:
+ if(sculpt_undo_restore_mask(C, dm, unode))
+ update= 1;
+ break;
}
}
@@ -324,6 +371,8 @@
}
MEM_freeN(unode->grid_hidden);
}
+ if(unode->mask)
+ MEM_freeN(unode->mask);
}
}
@@ -403,6 +452,10 @@
unode->vert_hidden = BLI_BITMAP_NEW(allvert,
"SculptUndoNode.vert_hidden");
break;
+ case SCULPT_UNDO_MASK:
+ unode->mask= MEM_mapallocN(sizeof(float)*allvert,
"SculptUndoNode.mask");
+ undo_paint_push_count_alloc(UNDO_PAINT_MESH,
(sizeof(float) * sizeof(int))*allvert);
+ break;
}
BLI_addtail(lb, unode);
@@ -464,6 +517,17 @@
}
}
+static void sculpt_undo_store_mask(Object *ob, SculptUndoNode *unode)
+{
+ SculptSession *ss = ob->sculpt;
+ PBVHVertexIter vd;
+
+ BLI_pbvh_vertex_iter_begin(ss->pbvh, unode->node, vd, PBVH_ITER_ALL) {
+ unode->mask[vd.i] = *vd.mask;
+ }
+ BLI_pbvh_vertex_iter_end;
+}
+
SculptUndoNode *sculpt_undo_push_node(Object *ob, PBVHNode *node,
SculptUndoType type)
{
@@ -504,6 +568,9 @@
case SCULPT_UNDO_HIDDEN:
sculpt_undo_store_hidden(ob, unode);
break;
+ case SCULPT_UNDO_MASK:
+ sculpt_undo_store_mask(ob, unode);
+ break;
}
/* store active shape key */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
