[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60479] trunk/blender/source/blender/ blenkernel/intern/node.c: replace inline searches for BLI_findindex

[Campbell Barton]

Revision: 60479
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60479
Author:   campbellbarton
Date:     2013-10-01 11:44:39 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
replace inline searches for BLI_findindex

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2013-10-01 11:29:50 UTC (rev 60478)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-10-01 11:44:39 UTC (rev 60479)
@@ -1118,11 +1118,8 @@
 	
 	if (bmain) {
 		/* is ntree part of library? */
-		for (newtree = bmain->nodetree.first; newtree; newtree = newtree->id.next) {
-			if (newtree == ntree) {
-				newtree = BKE_libblock_copy(&ntree->id);
-				break;
-			}
+		if (BLI_findindex(&bmain->nodetree, ntree) != -1) {
+			newtree = BKE_libblock_copy(&ntree->id);
 		}
 	}
 	else
@@ -1669,14 +1666,8 @@
 	
 	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node->type == NODE_GROUP && node->id) {
-			bNodeTree *ngroup = (bNodeTree *)node->id, *tntree;
-			
-			/* is ntree part of library? */
-			for (tntree = G.main->nodetree.first; tntree; tntree = tntree->id.next)
-				if (tntree == ngroup)
-					break;
-			
-			if (tntree == NULL) {
+			bNodeTree *ngroup = (bNodeTree *)node->id;
+			if (BLI_findindex(&G.main->nodetree, ngroup) == -1) {
 				/* ntree is not in library, i.e. localized node group: free it */
 				ntreeFreeTree_ex(ngroup, false);
 				MEM_freeN(ngroup);