[Bf-blender-cvs] [24556b3] id-remap: More cleanup - remove unused stuff, some simplifications.

[Bastien Montagne]

Commit: 24556b3c3d5c341cf3c657f49ff6ae6ed3c06029
Author: Bastien Montagne
Date:   Thu Dec 17 14:39:24 2015 +0100
Branches: id-remap
https://developer.blender.org/rB24556b3c3d5c341cf3c657f49ff6ae6ed3c06029

More cleanup - remove unused stuff, some simplifications.

===================================================================

M	source/blender/blenkernel/BKE_mask.h
M	source/blender/blenkernel/intern/mask.c
M	source/blender/editors/space_node/space_node.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
index 4417fcd..852e4df 100644
--- a/source/blender/blenkernel/BKE_mask.h
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -124,7 +124,6 @@ struct Mask *BKE_mask_copy_nolib(struct Mask *mask);
 struct Mask *BKE_mask_copy(struct Mask *mask);
 
 void BKE_mask_free(struct Mask *mask);
-void BKE_mask_unlink(struct Main *bmain, struct Mask *mask);
 
 void BKE_mask_coord_from_frame(float r_co[2], const float co[2], const float frame_size[2]);
 void BKE_mask_coord_from_movieclip(struct MovieClip *clip, struct MovieClipUser *user, float r_co[2], const float co[2]);
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index bb41e6c..000b28a 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -1019,59 +1019,6 @@ void BKE_mask_free(Mask *mask)
 	BKE_mask_layer_free_list(&mask->masklayers);
 }
 
-void BKE_mask_unlink(Main *bmain, Mask *mask)
-{
-	bScreen *scr;
-	ScrArea *area;
-	SpaceLink *sl;
-	Scene *scene;
-
-	for (scr = bmain->screen.first; scr; scr = scr->id.next) {
-		for (area = scr->areabase.first; area; area = area->next) {
-			for (sl = area->spacedata.first; sl; sl = sl->next) {
-				switch (sl->spacetype) {
-					case SPACE_CLIP:
-					{
-						SpaceClip *sc = (SpaceClip *)sl;
-
-						if (sc->mask_info.mask == mask) {
-							sc->mask_info.mask = NULL;
-						}
-						break;
-					}
-					case SPACE_IMAGE:
-					{
-						SpaceImage *sima = (SpaceImage *)sl;
-
-						if (sima->mask_info.mask == mask) {
-							sima->mask_info.mask = NULL;
-						}
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	for (scene = bmain->scene.first; scene; scene = scene->id.next) {
-		if (scene->ed) {
-			Sequence *seq;
-
-			SEQ_BEGIN (scene->ed, seq)
-			{
-				if (seq->mask == mask) {
-					seq->mask = NULL;
-				}
-			}
-			SEQ_END
-		}
-	}
-
-	FOREACH_NODETREE(bmain, ntree, id) {
-		BKE_node_tree_unlink_id((ID *)mask, ntree);
-	} FOREACH_NODETREE_END
-}
-
 void BKE_mask_coord_from_frame(float r_co[2], const float co[2], const float frame_size[2])
 {
 	if (frame_size[0] == frame_size[1]) {
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index e6f91e2..eaa0767 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -831,12 +831,7 @@ static void node_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID
 			/* nasty DNA logic for SpaceNode:
 			 * ideally should be handled by editor code, but would be bad level call
 			 */
-			bNodeTreePath *path, *path_next;
-			for (path = snode->treepath.first; path; path = path_next) {
-				path_next = path->next;
-				MEM_freeN(path);
-			}
-			BLI_listbase_clear(&snode->treepath);
+			BLI_freelistN(&snode->treepath);
 
 			/* XXX Untested in case new_id != NULL... */
 			snode->id = new_id;