[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49465] trunk/blender/source/blender: rename meaningless LIB flag name LIB_TEST --> LIB_NEED_EXPAND.
Campbell Barton
ideasman42 at gmail.com
Wed Aug 1 17:32:27 CEST 2012
Revision: 49465
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49465
Author: campbellbarton
Date: 2012-08-01 15:32:27 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
rename meaningless LIB flag name LIB_TEST --> LIB_NEED_EXPAND.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
trunk/blender/source/blender/makesdna/DNA_ID.h
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-08-01 15:21:39 UTC (rev 49464)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-08-01 15:32:27 UTC (rev 49465)
@@ -1667,8 +1667,8 @@
/* 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 @@
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 @@
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 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
}
}
- 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
- part->id.flag -= LIB_NEEDLINK;
+ part->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -3662,7 +3662,7 @@
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 @@
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 @@
BKE_mesh_tessface_clear(me);
#endif
- me->id.flag -= LIB_NEEDLINK;
+ me->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -3965,13 +3965,13 @@
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, <->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 @@
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 @@
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 @@
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 @@
/* 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 @@
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 @@
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 @@
}
}
}
- sc->id.flag -= LIB_NEEDLINK;
+ sc->id.flag -= LIB_NEED_LINK;
}
}
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list