From aa23f98bda685d645aca03bf12608db628983122 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 1 Aug 2012 15:32:27 +0000
Subject: rename meaningless LIB flag name LIB_TEST --> LIB_NEED_EXPAND.

---
 source/blender/blenloader/intern/readfile.c        | 122 ++++++++++-----------
 .../blender/blenloader/intern/versioning_legacy.c  |   4 +-
 2 files changed, 63 insertions(+), 63 deletions(-)

(limited to 'source/blender/blenloader')

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4ab0076d000..f05ab16eb82 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1667,8 +1667,8 @@ static void lib_link_brush(FileData *fd, Main *main)
 	
 	/* only link ID pointers */
 	for (brush = main->brush.first; brush; brush = brush->id.next) {
-		if (brush->id.flag & LIB_NEEDLINK) {
-			brush->id.flag -= LIB_NEEDLINK;
+		if (brush->id.flag & LIB_NEED_LINK) {
+			brush->id.flag -= LIB_NEED_LINK;
 			
 			brush->mtex.tex = newlibadr_us(fd, brush->id.lib, brush->mtex.tex);
 			brush->clone.image = newlibadr_us(fd, brush->id.lib, brush->clone.image);
@@ -1739,13 +1739,13 @@ static void lib_link_ipo(FileData *fd, Main *main)
 	Ipo *ipo;
 	
 	for (ipo = main->ipo.first; ipo; ipo = ipo->id.next) {
-		if (ipo->id.flag & LIB_NEEDLINK) {
+		if (ipo->id.flag & LIB_NEED_LINK) {
 			IpoCurve *icu;
 			for (icu = ipo->curve.first; icu; icu = icu->next) {
 				if (icu->driver)
 					icu->driver->ob = newlibadr(fd, ipo->id.lib, icu->driver->ob);
 			}
-			ipo->id.flag -= LIB_NEEDLINK;
+			ipo->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -1960,8 +1960,8 @@ static void lib_link_action(FileData *fd, Main *main)
 	bActionChannel *chan;
 
 	for (act = main->action.first; act; act = act->id.next) {
-		if (act->id.flag & LIB_NEEDLINK) {
-			act->id.flag -= LIB_NEEDLINK;
+		if (act->id.flag & LIB_NEED_LINK) {
+			act->id.flag -= LIB_NEED_LINK;
 			
 // XXX depreceated - old animation system <<<
 			for (chan=act->chanbase.first; chan; chan=chan->next) {
@@ -2187,8 +2187,8 @@ static void lib_link_nodetree(FileData *fd, Main *main)
 	
 	/* only link ID pointers */
 	for (ntree = main->nodetree.first; ntree; ntree = ntree->id.next) {
-		if (ntree->id.flag & LIB_NEEDLINK) {
-			ntree->id.flag -= LIB_NEEDLINK;
+		if (ntree->id.flag & LIB_NEED_LINK) {
+			ntree->id.flag -= LIB_NEED_LINK;
 			lib_link_ntree(fd, &ntree->id, ntree);
 		}
 	}
@@ -2610,9 +2610,9 @@ static void lib_link_armature(FileData *fd, Main *main)
 	bArmature *arm;
 	
 	for (arm = main->armature.first; arm; arm = arm->id.next) {
-		if (arm->id.flag & LIB_NEEDLINK) {
+		if (arm->id.flag & LIB_NEED_LINK) {
 			if (arm->adt) lib_link_animdata(fd, &arm->id, arm->adt);
-			arm->id.flag -= LIB_NEEDLINK;
+			arm->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -2660,14 +2660,14 @@ static void lib_link_camera(FileData *fd, Main *main)
 	Camera *ca;
 	
 	for (ca = main->camera.first; ca; ca = ca->id.next) {
-		if (ca->id.flag & LIB_NEEDLINK) {
+		if (ca->id.flag & LIB_NEED_LINK) {
 			if (ca->adt) lib_link_animdata(fd, &ca->id, ca->adt);
 			
 			ca->ipo = newlibadr_us(fd, ca->id.lib, ca->ipo); // XXX depreceated - old animation system
 			
 			ca->dof_ob = newlibadr_us(fd, ca->id.lib, ca->dof_ob);
 			
-			ca->id.flag -= LIB_NEEDLINK;
+			ca->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -2688,7 +2688,7 @@ static void lib_link_lamp(FileData *fd, Main *main)
 	int a;
 	
 	for (la = main->lamp.first; la; la = la->id.next) {
-		if (la->id.flag & LIB_NEEDLINK) {
+		if (la->id.flag & LIB_NEED_LINK) {
 			if (la->adt) lib_link_animdata(fd, &la->id, la->adt);
 			
 			for (a = 0; a < MAX_MTEX; a++) {
@@ -2704,7 +2704,7 @@ static void lib_link_lamp(FileData *fd, Main *main)
 			if (la->nodetree)
 				lib_link_ntree(fd, &la->id, la->nodetree);
 			
-			la->id.flag -= LIB_NEEDLINK;
+			la->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -2748,13 +2748,13 @@ static void lib_link_key(FileData *fd, Main *main)
 			}
 		}
 		
-		if (key->id.flag & LIB_NEEDLINK) {
+		if (key->id.flag & LIB_NEED_LINK) {
 			if (key->adt) lib_link_animdata(fd, &key->id, key->adt);
 			
 			key->ipo = newlibadr_us(fd, key->id.lib, key->ipo); // XXX depreceated - old animation system
 			key->from = newlibadr(fd, key->id.lib, key->from);
 			
-			key->id.flag -= LIB_NEEDLINK;
+			key->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -2818,7 +2818,7 @@ static void lib_link_mball(FileData *fd, Main *main)
 	int a;
 	
 	for (mb = main->mball.first; mb; mb = mb->id.next) {
-		if (mb->id.flag & LIB_NEEDLINK) {
+		if (mb->id.flag & LIB_NEED_LINK) {
 			if (mb->adt) lib_link_animdata(fd, &mb->id, mb->adt);
 			
 			for (a = 0; a < mb->totcol; a++) 
@@ -2826,7 +2826,7 @@ static void lib_link_mball(FileData *fd, Main *main)
 			
 			mb->ipo = newlibadr_us(fd, mb->id.lib, mb->ipo); // XXX depreceated - old animation system
 			
-			mb->id.flag -= LIB_NEEDLINK;
+			mb->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -2857,7 +2857,7 @@ static void lib_link_world(FileData *fd, Main *main)
 	int a;
 	
 	for (wrld = main->world.first; wrld; wrld = wrld->id.next) {
-		if (wrld->id.flag & LIB_NEEDLINK) {
+		if (wrld->id.flag & LIB_NEED_LINK) {
 			if (wrld->adt) lib_link_animdata(fd, &wrld->id, wrld->adt);
 			
 			wrld->ipo = newlibadr_us(fd, wrld->id.lib, wrld->ipo); // XXX depreceated - old animation system
@@ -2873,7 +2873,7 @@ static void lib_link_world(FileData *fd, Main *main)
 			if (wrld->nodetree)
 				lib_link_ntree(fd, &wrld->id, wrld->nodetree);
 			
-			wrld->id.flag -= LIB_NEEDLINK;
+			wrld->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -2904,8 +2904,8 @@ static void lib_link_vfont(FileData *UNUSED(fd), Main *main)
 	VFont *vf;
 	
 	for (vf = main->vfont.first; vf; vf = vf->id.next) {
-		if (vf->id.flag & LIB_NEEDLINK) {
-			vf->id.flag -= LIB_NEEDLINK;
+		if (vf->id.flag & LIB_NEED_LINK) {
+			vf->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -2923,8 +2923,8 @@ static void lib_link_text(FileData *UNUSED(fd), Main *main)
 	Text *text;
 	
 	for (text = main->text.first; text; text = text->id.next) {
-		if (text->id.flag & LIB_NEEDLINK) {
-			text->id.flag -= LIB_NEEDLINK;
+		if (text->id.flag & LIB_NEED_LINK) {
+			text->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -2976,10 +2976,10 @@ static void lib_link_image(FileData *fd, Main *main)
 	Image *ima;
 	
 	for (ima = main->image.first; ima; ima = ima->id.next) {
-		if (ima->id.flag & LIB_NEEDLINK) {
+		if (ima->id.flag & LIB_NEED_LINK) {
 			if (ima->id.properties) IDP_LibLinkProperty(ima->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
 			
-			ima->id.flag -= LIB_NEEDLINK;
+			ima->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -3046,7 +3046,7 @@ static void lib_link_curve(FileData *fd, Main *main)
 	int a;
 	
 	for (cu = main->curve.first; cu; cu = cu->id.next) {
-		if (cu->id.flag & LIB_NEEDLINK) {
+		if (cu->id.flag & LIB_NEED_LINK) {
 			if (cu->adt) lib_link_animdata(fd, &cu->id, cu->adt);
 			
 			for (a = 0; a < cu->totcol; a++) 
@@ -3063,7 +3063,7 @@ static void lib_link_curve(FileData *fd, Main *main)
 			cu->ipo = newlibadr_us(fd, cu->id.lib, cu->ipo); // XXX depreceated - old animation system
 			cu->key = newlibadr_us(fd, cu->id.lib, cu->key);
 			
-			cu->id.flag -= LIB_NEEDLINK;
+			cu->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -3148,7 +3148,7 @@ static void lib_link_texture(FileData *fd, Main *main)
 	Tex *tex;
 	
 	for (tex = main->tex.first; tex; tex = tex->id.next) {
-		if (tex->id.flag & LIB_NEEDLINK) {
+		if (tex->id.flag & LIB_NEED_LINK) {
 			if (tex->adt) lib_link_animdata(fd, &tex->id, tex->adt);
 			
 			tex->ima = newlibadr_us(fd, tex->id.lib, tex->ima);
@@ -3165,7 +3165,7 @@ static void lib_link_texture(FileData *fd, Main *main)
 			if (tex->nodetree)
 				lib_link_ntree(fd, &tex->id, tex->nodetree);
 			
-			tex->id.flag -= LIB_NEEDLINK;
+			tex->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -3224,7 +3224,7 @@ static void lib_link_material(FileData *fd, Main *main)
 	int a;
 	
 	for (ma = main->mat.first; ma; ma = ma->id.next) {
-		if (ma->id.flag & LIB_NEEDLINK) {
+		if (ma->id.flag & LIB_NEED_LINK) {
 			if (ma->adt) lib_link_animdata(fd, &ma->id, ma->adt);
 			
 			/* Link ID Properties -- and copy this comment EXACTLY for easy finding
@@ -3245,7 +3245,7 @@ static void lib_link_material(FileData *fd, Main *main)
 			if (ma->nodetree)
 				lib_link_ntree(fd, &ma->id, ma->nodetree);
 			
-			ma->id.flag -= LIB_NEEDLINK;
+			ma->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -3367,7 +3367,7 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
 	int a;
 	
 	for (part = main->particle.first; part; part = part->id.next) {
-		if (part->id.flag & LIB_NEEDLINK) {
+		if (part->id.flag & LIB_NEED_LINK) {
 			if (part->adt) lib_link_animdata(fd, &part->id, part->adt);
 			part->ipo = newlibadr_us(fd, part->id.lib, part->ipo); // XXX depreceated - old animation system
 			
@@ -3449,7 +3449,7 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
 				}
 			}
 			
-			part->id.flag -= LIB_NEEDLINK;
+			part->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -3662,7 +3662,7 @@ static void lib_link_mesh(FileData *fd, Main *main)
 	Mesh *me;
 	
 	for (me = main->mesh.first; me; me = me->id.next) {
-		if (me->id.flag & LIB_NEEDLINK) {
+		if (me->id.flag & LIB_NEED_LINK) {
 			int i;
 			
 			/* Link ID Properties -- and copy this comment EXACTLY for easy finding
@@ -3706,7 +3706,7 @@ static void lib_link_mesh(FileData *fd, Main *main)
 	convert_tface_mt(fd, main);
 
 	for (me = main->mesh.first; me; me = me->id.next) {
-		if (me->id.flag & LIB_NEEDLINK) {
+		if (me->id.flag & LIB_NEED_LINK) {
 			/*
 			 * Re-tessellate, even if the polys were just created from tessfaces, this
 			 * is important because it:
@@ -3723,7 +3723,7 @@ static void lib_link_mesh(FileData *fd, Main *main)
 			BKE_mesh_tessface_clear(me);
 #endif
 
-			me->id.flag -= LIB_NEEDLINK;
+			me->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -3965,13 +3965,13 @@ static void lib_link_latt(FileData *fd, Main *main)
 	Lattice *lt;
 	
 	for (lt = main->latt.first; lt; lt = lt->id.next) {
-		if (lt->id.flag & LIB_NEEDLINK) {
+		if (lt->id.flag & LIB_NEED_LINK) {
 			if (lt->adt) lib_link_animdata(fd, &lt->id, lt->adt);
 			
 			lt->ipo = newlibadr_us(fd, lt->id.lib, lt->ipo); // XXX depreceated - old animation system
 			lt->key = newlibadr_us(fd, lt->id.lib, lt->key);
 			
-			lt->id.flag -= LIB_NEEDLINK;
+			lt->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -4018,7 +4018,7 @@ static void lib_link_object(FileData *fd, Main *main)
 	int warn=0, a;
 	
 	for (ob = main->object.first; ob; ob = ob->id.next) {
-		if (ob->id.flag & LIB_NEEDLINK) {
+		if (ob->id.flag & LIB_NEED_LINK) {
 			if (ob->id.properties) IDP_LibLinkProperty(ob->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
 			if (ob->adt) lib_link_animdata(fd, &ob->id, ob->adt);
 			
@@ -4097,7 +4097,7 @@ static void lib_link_object(FileData *fd, Main *main)
 			ob->gpd = newlibadr_us(fd, ob->id.lib, ob->gpd);
 			ob->duplilist = NULL;
 			
-			ob->id.flag -= LIB_NEEDLINK;
+			ob->id.flag -= LIB_NEED_LINK;
 			/* if id.us==0 a new base will be created later on */
 			
 			/* WARNING! Also check expand_object(), should reflect the stuff below. */
@@ -4793,7 +4793,7 @@ static void lib_link_scene(FileData *fd, Main *main)
 	TimeMarker *marker;
 	
 	for (sce = main->scene.first; sce; sce = sce->id.next) {
-		if (sce->id.flag & LIB_NEEDLINK) {
+		if (sce->id.flag & LIB_NEED_LINK) {
 			/* Link ID Properties -- and copy this comment EXACTLY for easy finding
 			 * of library blocks that implement this.*/
 			if (sce->id.properties) IDP_LibLinkProperty(sce->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
@@ -4891,7 +4891,7 @@ static void lib_link_scene(FileData *fd, Main *main)
 			/* Motion Tracking */
 			sce->clip = newlibadr_us(fd, sce->id.lib, sce->clip);
 			
-			sce->id.flag -= LIB_NEEDLINK;
+			sce->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -5152,11 +5152,11 @@ static void lib_link_windowmanager(FileData *fd, Main *main)
 	wmWindow *win;
 	
 	for (wm = main->wm.first; wm; wm = wm->id.next) {
-		if (wm->id.flag & LIB_NEEDLINK) {
+		if (wm->id.flag & LIB_NEED_LINK) {
 			for (win = wm->windows.first; win; win = win->next)
 				win->screen = newlibadr(fd, NULL, win->screen);
 			
-			wm->id.flag -= LIB_NEEDLINK;
+			wm->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -5224,7 +5224,7 @@ static void lib_link_screen(FileData *fd, Main *main)
 	ScrArea *sa;
 	
 	for (sc = main->screen.first; sc; sc = sc->id.next) {
-		if (sc->id.flag & LIB_NEEDLINK) {
+		if (sc->id.flag & LIB_NEED_LINK) {
 			sc->id.us = 1;
 			sc->scene = newlibadr(fd, sc->id.lib, sc->scene);
 			sc->animtimer = NULL; /* saved in rare cases */
@@ -5398,7 +5398,7 @@ static void lib_link_screen(FileData *fd, Main *main)
 					}
 				}
 			}
-			sc->id.flag -= LIB_NEEDLINK;
+			sc->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -6084,7 +6084,7 @@ static void lib_link_speaker(FileData *fd, Main *main)
 	Speaker *spk;
 	
 	for (spk = main->speaker.first; spk; spk = spk->id.next) {
-		if (spk->id.flag & LIB_NEEDLINK) {
+		if (spk->id.flag & LIB_NEED_LINK) {
 			if (spk->adt) lib_link_animdata(fd, &spk->id, spk->adt);
 			
 			spk->sound= newlibadr(fd, spk->id.lib, spk->sound);
@@ -6092,7 +6092,7 @@ static void lib_link_speaker(FileData *fd, Main *main)
 				spk->sound->id.us++;
 			}
 			
-			spk->id.flag -= LIB_NEEDLINK;
+			spk->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -6131,8 +6131,8 @@ static void lib_link_sound(FileData *fd, Main *main)
 	bSound *sound;
 	
 	for (sound = main->sound.first; sound; sound = sound->id.next) {
-		if (sound->id.flag & LIB_NEEDLINK) {
-			sound->id.flag -= LIB_NEEDLINK;
+		if (sound->id.flag & LIB_NEED_LINK) {
+			sound->id.flag -= LIB_NEED_LINK;
 			sound->ipo = newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX depreceated - old animation system
 			
 			sound_load(main, sound);
@@ -6153,8 +6153,8 @@ static void lib_link_group(FileData *fd, Main *main)
 	int add_us;
 	
 	for (group = main->group.first; group; group = group->id.next) {
-		if (group->id.flag & LIB_NEEDLINK) {
-			group->id.flag -= LIB_NEEDLINK;
+		if (group->id.flag & LIB_NEED_LINK) {
+			group->id.flag -= LIB_NEED_LINK;
 			
 			add_us = 0;
 			
@@ -6243,7 +6243,7 @@ static void lib_link_movieclip(FileData *fd, Main *main)
 	MovieClip *clip;
 	
 	for (clip = main->movieclip.first; clip; clip = clip->id.next) {
-		if (clip->id.flag & LIB_NEEDLINK) {
+		if (clip->id.flag & LIB_NEED_LINK) {
 			MovieTracking *tracking = &clip->tracking;
 			MovieTrackingObject *object;
 
@@ -6258,7 +6258,7 @@ static void lib_link_movieclip(FileData *fd, Main *main)
 				lib_link_movieTracks(fd, clip, &object->tracks);
 			}
 
-			clip->id.flag -= LIB_NEEDLINK;
+			clip->id.flag -= LIB_NEED_LINK;
 		}
 	}
 }
@@ -6314,7 +6314,7 @@ static void lib_link_mask(FileData *fd, Main *main)
 
 	mask = main->mask.first;
 	while (mask) {
-		if (mask->id.flag & LIB_NEEDLINK) {
+		if (mask->id.flag & LIB_NEED_LINK) {
 			MaskLayer *masklay;
 
 			if (mask->adt)
@@ -6339,7 +6339,7 @@ static void lib_link_mask(FileData *fd, Main *main)
 				}
 			}
 
-			mask->id.flag -= LIB_NEEDLINK;
+			mask->id.flag -= LIB_NEED_LINK;
 		}
 		mask = mask->id.next;
 	}
@@ -6440,7 +6440,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID
 	BLI_addtail(lb, id);
 	
 	/* clear first 8 bits */
-	id->flag = (id->flag & 0xFF00) | flag | LIB_NEEDLINK;
+	id->flag = (id->flag & 0xFF00) | flag | LIB_NEED_LINK;
 	id->lib = main->curlib;
 	if (id->flag & LIB_FAKEUSER) id->us= 1;
 	else id->us = 0;
@@ -8977,7 +8977,7 @@ static void expand_main(FileData *fd, Main *mainvar)
 		while (a--) {
 			id= lbarray[a]->first;
 			while (id) {
-				if (id->flag & LIB_TEST) {
+				if (id->flag & LIB_NEED_EXPAND) {
 					switch (GS(id->name)) {
 					case ID_OB:
 						expand_object(fd, mainvar, (Object *)id);
@@ -9051,7 +9051,7 @@ static void expand_main(FileData *fd, Main *mainvar)
 					}
 					
 					do_it = TRUE;
-					id->flag -= LIB_TEST;
+					id->flag -= LIB_NEED_EXPAND;
 					
 				}
 				id = id->next;
@@ -9266,7 +9266,7 @@ static void append_id_part(FileData *fd, Main *mainvar, ID *id, ID **id_r)
 			
 			if (strcmp(id->name, bhead_id_name(fd, bhead))==0) {
 				id->flag &= ~LIB_READ;
-				id->flag |= LIB_TEST;
+				id->flag |= LIB_NEED_EXPAND;
 //				printf("read lib block %s\n", id->name);
 				read_libblock(fd, mainvar, bhead, id->flag, id_r);
 				
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 46ef2716ade..c31906cbd80 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -569,7 +569,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 		/* tex->extend and tex->imageflag have changed: */
 		Tex *tex = main->tex.first;
 		while (tex) {
-			if (tex->id.flag & LIB_NEEDLINK) {
+			if (tex->id.flag & LIB_NEED_LINK) {
 
 				if (tex->extend == 0) {
 					if (tex->xrepeat || tex->yrepeat) {
@@ -3107,7 +3107,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 				part->id.lib = ob->id.lib;
 
 				part->id.us--;
-				part->id.flag |= (ob->id.flag & LIB_NEEDLINK);
+				part->id.flag |= (ob->id.flag & LIB_NEED_LINK);
 
 				psys->totpart = 0;
 				psys->flag = PSYS_ENABLED|PSYS_CURRENT;
-- 
cgit v1.2.3