diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-04-20 22:48:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-20 22:48:30 +0400 |
commit | c7b1e5c11df31c437834088fc056a27fe852bfe1 (patch) | |
tree | 0ed49ef356e72fd4f6f7d5f9778cac9fa91c3ea7 /source/blender/src/filesel.c | |
parent | 94b7743dd3f298fa6c93e541813f43df8a3828d5 (diff) |
export_fbx.py - support scene start/end frames, fpx, mist settings, better default camera writing.
BPyObject.py - function for getting an objects armature, look at both parent and modifier.
editmesh_add.c and BPyAddMesh.py - check for multires
filesel.c, Append/Link had a bug where files linked in, didnt have the LIB_APPEND_TAG unset, and appending these into a new blend file would link instead.
BKE_library.h, library.c - utility functions for flagging listbases flag_all_listbases_ids and and flag_listbase_ids
Diffstat (limited to 'source/blender/src/filesel.c')
-rw-r--r-- | source/blender/src/filesel.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index d8f1b732e19..3a2e9414354 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -2395,17 +2395,9 @@ static void do_library_append(SpaceFile *sfile) Object *ob; int idcode = groupname_to_code(group); - if((sfile->flag & FILE_LINK)==0) { + if((sfile->flag & FILE_LINK)==0) /* tag everything, all untagged data can be made local */ - ID *id; - ListBase *lbarray[MAX_LIBARRAY]; - int a; - - a= set_listbasepointers(G.main, lbarray); - while(a--) { - for(id= lbarray[a]->first; id; id= id->next) id->flag |= LIB_APPEND_TAG; - } - } + flag_all_listbases_ids(LIB_APPEND_TAG, 1); BLO_library_append(sfile, dir, idcode); @@ -2428,6 +2420,10 @@ static void do_library_append(SpaceFile *sfile) /* make local */ if(lib && (sfile->flag & FILE_LINK)==0) { all_local(lib, 1); + /* important we unset, otherwise these object wont + * link into other scenes from this blend file */ + flag_all_listbases_ids(LIB_APPEND_TAG, 1); + } DAG_scene_sort(G.scene); |