Code cleanup: split up some long functions in sculpt_undo.c.

Should be no functional changes.

1 files changed, 121 insertions, 89 deletions

diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index b1f009522fa..46a75d3b722 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -67,13 +67,12 @@
 
 /************************** Undo *************************/
 
-static void update_cb(PBVHNode *node, void *unused)
+static void update_cb(PBVHNode *node, void *UNUSED(unused))
 {
-	(void)unused;
 	BLI_pbvh_node_mark_update(node);
 }
 
-static void sculpt_restore_deformed(SculptSession *ss, SculptUndoNode *unode, int uindex, int oindex, float coord[3])
+static void sculpt_undo_restore_deformed(SculptSession *ss, SculptUndoNode *unode, int uindex, int oindex, float coord[3])
 {
 	if(unode->orig_co) {
 		swap_v3_v3(coord, unode->orig_co[uindex]);
@@ -81,105 +80,124 @@ static void sculpt_restore_deformed(SculptSession *ss, SculptUndoNode *unode, in
 	} else swap_v3_v3(coord, unode->co[uindex]);
 }
 
-static void sculpt_undo_restore(bContext *C, ListBase *lb)
+static int sculpt_undo_restore_coords(bContext *C, DerivedMesh *dm, SculptUndoNode *unode)
 {
-	Scene *scene = CTX_data_scene(C);
-	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-	Object *ob = CTX_data_active_object(C);
-	DerivedMesh *dm = mesh_get_derived_final(scene, ob, 0);
-	SculptSession *ss = ob->sculpt;
-	SculptUndoNode *unode;
+	Scene *scene= CTX_data_scene(C);
+	Sculpt *sd= CTX_data_tool_settings(C)->sculpt;
+	Object *ob= CTX_data_active_object(C);
+	SculptSession *ss= ob->sculpt;
 	MVert *mvert;
-	MultiresModifierData *mmd;
-	int *index;
-	int i, j, update= 0;
+	int *index, i, j;	
+	
+	if(unode->maxvert) {
+		/* regular mesh restore */
 
-	sculpt_update_mesh_elements(scene, sd, ob, 0);
+		if (ss->kb && strcmp(ss->kb->name, unode->shapeName)) {
+			/* shape key has been changed before calling undo operator */
 
-	for(unode=lb->first; unode; unode=unode->next) {
-		if(!(strcmp(unode->idname, ob->id.name)==0))
-			continue;
+			Key *key= ob_get_key(ob);
+			KeyBlock *kb= key_get_named_keyblock(key, unode->shapeName);
 
-		if(unode->maxvert) {
-			/* regular mesh restore */
-			if(ss->totvert != unode->maxvert)
-				continue;
+			if (kb) {
+				ob->shapenr= BLI_findindex(&key->block, kb) + 1;
 
-			if (ss->kb && strcmp(ss->kb->name, unode->shapeName)) {
-				/* shape key has been changed before calling undo operator */
+				sculpt_update_mesh_elements(scene, sd, ob, 0);
+				WM_event_add_notifier(C, NC_OBJECT|ND_DATA, ob);
+			} else {
+				/* key has been removed -- skip this undo node */
+				return 0;
+			}
+		}
 
-				Key *key= ob_get_key(ob);
-				KeyBlock *kb= key_get_named_keyblock(key, unode->shapeName);
+		index= unode->index;
+		mvert= ss->mvert;
 
-				if (kb) {
-					ob->shapenr= BLI_findindex(&key->block, kb) + 1;
+		if (ss->kb) {
+			float (*vertCos)[3];
+			vertCos= key_to_vertcos(ob, ss->kb);
 
-					sculpt_update_mesh_elements(scene, sd, ob, 0);
-					WM_event_add_notifier(C, NC_OBJECT|ND_DATA, ob);
-				} else {
-					/* key has been removed -- skip this undo node */
-					continue;
+			for(i=0; i<unode->totvert; i++) {
+				if(ss->modifiers_active) sculpt_undo_restore_deformed(ss, unode, i, index[i], vertCos[index[i]]);
+				else {
+					if(unode->orig_co) swap_v3_v3(vertCos[index[i]], unode->orig_co[i]);
+					else swap_v3_v3(vertCos[index[i]], unode->co[i]);
 				}
 			}
 
-			index= unode->index;
-			mvert= ss->mvert;
+			/* propagate new coords to keyblock */
+			sculpt_vertcos_to_key(ob, ss->kb, vertCos);
 
-			if (ss->kb) {
-				float (*vertCos)[3];
-				vertCos= key_to_vertcos(ob, ss->kb);
+			/* pbvh uses it's own mvert array, so coords should be */
+			/* propagated to pbvh here */
+			BLI_pbvh_apply_vertCos(ss->pbvh, vertCos);
 
-				for(i=0; i<unode->totvert; i++) {
-					if(ss->modifiers_active) sculpt_restore_deformed(ss, unode, i, index[i], vertCos[index[i]]);
-					else {
-						if(unode->orig_co) swap_v3_v3(vertCos[index[i]], unode->orig_co[i]);
-						else swap_v3_v3(vertCos[index[i]], unode->co[i]);
-					}
+			MEM_freeN(vertCos);
+		} else {
+			for(i=0; i<unode->totvert; i++) {
+				if(ss->modifiers_active) sculpt_undo_restore_deformed(ss, unode, i, index[i], mvert[index[i]].co);
+				else {
+					if(unode->orig_co) swap_v3_v3(mvert[index[i]].co, unode->orig_co[i]);
+					else swap_v3_v3(mvert[index[i]].co, unode->co[i]);
 				}
+				mvert[index[i]].flag |= ME_VERT_PBVH_UPDATE;
+			}
+		}
+	}
+	else if(unode->maxgrid && dm->getGridData) {
+		/* multires restore */
+		DMGridData **grids, *grid;
+		float (*co)[3];
+		int gridsize;
 
-				/* propagate new coords to keyblock */
-				sculpt_vertcos_to_key(ob, ss->kb, vertCos);
+		grids= dm->getGridData(dm);
+		gridsize= dm->getGridSize(dm);
 
-				/* pbvh uses it's own mvert array, so coords should be */
-				/* propagated to pbvh here */
-				BLI_pbvh_apply_vertCos(ss->pbvh, vertCos);
+		co = unode->co;
+		for(j=0; j<unode->totgrid; j++) {
+			grid= grids[unode->grids[j]];
 
-				MEM_freeN(vertCos);
-			} else {
-				for(i=0; i<unode->totvert; i++) {
-					if(ss->modifiers_active) sculpt_restore_deformed(ss, unode, i, index[i], mvert[index[i]].co);
-					else {
-						if(unode->orig_co) swap_v3_v3(mvert[index[i]].co, unode->orig_co[i]);
-						else swap_v3_v3(mvert[index[i]].co, unode->co[i]);
-					}
-					mvert[index[i]].flag |= ME_VERT_PBVH_UPDATE;
-				}
-			}
+			for(i=0; i<gridsize*gridsize; i++, co++)
+				swap_v3_v3(grid[i].co, co[0]);
 		}
-		else if(unode->maxgrid && dm->getGridData) {
-			/* multires restore */
-			DMGridData **grids, *grid;
-			float (*co)[3];
-			int gridsize;
+	}
 
-			if(dm->getNumGrids(dm) != unode->maxgrid)
-				continue;
-			if(dm->getGridSize(dm) != unode->gridsize)
-				continue;
+	return 1;
+}
 
-			grids= dm->getGridData(dm);
-			gridsize= dm->getGridSize(dm);
+static void sculpt_undo_restore(bContext *C, ListBase *lb)
+{
+	Scene *scene = CTX_data_scene(C);
+	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
+	Object *ob = CTX_data_active_object(C);
+	DerivedMesh *dm = mesh_get_derived_final(scene, ob, 0);
+	SculptSession *ss = ob->sculpt;
+	SculptUndoNode *unode;
+	MultiresModifierData *mmd;
+	int update= 0;
 
-			co = unode->co;
-			for(j=0; j<unode->totgrid; j++) {
-				grid= grids[unode->grids[j]];
+	sculpt_update_mesh_elements(scene, sd, ob, 0);
 
-				for(i=0; i<gridsize*gridsize; i++, co++)
-					swap_v3_v3(grid[i].co, co[0]);
-			}
+	for(unode=lb->first; unode; unode=unode->next) {
+		if(!(strcmp(unode->idname, ob->id.name)==0))
+			continue;
+
+		/* check if undo data matches current data well enough to
+		   continue */
+		if(unode->maxvert) {
+			if(ss->totvert != unode->maxvert)
+				continue;
+		}
+		else if(unode->maxgrid && dm->getGridData) {
+			if((dm->getNumGrids(dm) != unode->maxgrid) ||
+			   (dm->getGridSize(dm) != unode->gridsize))
+				continue;
+		}
+		else {
+			continue;
 		}
 
-		update= 1;
+		if(sculpt_undo_restore_coords(C, dm, unode))
+			update= 1;
 	}
 
 	if(update) {
@@ -246,21 +264,13 @@ SculptUndoNode *sculpt_undo_get_node(PBVHNode *node)
 	return NULL;
 }
 
-SculptUndoNode *sculpt_undo_push_node(Object *ob, PBVHNode *node)
+SculptUndoNode *sculpt_undo_alloc_node(Object *ob, PBVHNode *node)
 {
 	ListBase *lb= undo_paint_push_get_list(UNDO_PAINT_MESH);
-	SculptSession *ss = ob->sculpt;
 	SculptUndoNode *unode;
+	SculptSession *ss= ob->sculpt;
 	int totvert, allvert, totgrid, maxgrid, gridsize, *grids;
-
-	/* list is manipulated by multiple threads, so we lock */
-	BLI_lock_thread(LOCK_CUSTOM1);
-
-	if((unode= sculpt_undo_get_node(node))) {
-		BLI_unlock_thread(LOCK_CUSTOM1);
-		return unode;
-	}
-
+	
 	unode= MEM_callocN(sizeof(SculptUndoNode), "SculptUndoNode");
 	BLI_strncpy(unode->idname, ob->id.name, sizeof(unode->idname));
 	unode->node= node;
@@ -292,6 +302,24 @@ SculptUndoNode *sculpt_undo_push_node(Object *ob, PBVHNode *node)
 	if(ss->modifiers_active)
 		unode->orig_co= MEM_callocN(allvert*sizeof(*unode->orig_co), "undoSculpt orig_cos");
 
+	return unode;
+}
+
+SculptUndoNode *sculpt_undo_push_node(Object *ob, PBVHNode *node)
+{
+	SculptSession *ss = ob->sculpt;
+	SculptUndoNode *unode;
+
+	/* list is manipulated by multiple threads, so we lock */
+	BLI_lock_thread(LOCK_CUSTOM1);
+
+	if((unode= sculpt_undo_get_node(node))) {
+		BLI_unlock_thread(LOCK_CUSTOM1);
+		return unode;
+	}
+
+	unode= sculpt_undo_alloc_node(ob, node);
+
 	BLI_unlock_thread(LOCK_CUSTOM1);
 
 	/* copy threaded, hopefully this is the performance critical part */
@@ -310,8 +338,12 @@ SculptUndoNode *sculpt_undo_push_node(Object *ob, PBVHNode *node)
 		BLI_pbvh_vertex_iter_end;
 	}
 
-	if(unode->grids)
+	if(unode->grids) {
+		int totgrid, *grids;
+		BLI_pbvh_node_get_grids(ss->pbvh, node, &grids, &totgrid,
+								NULL, NULL, NULL, NULL);
 		memcpy(unode->grids, grids, sizeof(int)*totgrid);
+	}
 
 	/* store active shape key */
 	if(ss->kb) BLI_strncpy(unode->shapeName, ss->kb->name, sizeof(ss->kb->name));