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/python/api2_2x/Library.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/python/api2_2x/Library.c')
-rw-r--r-- | source/blender/python/api2_2x/Library.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/python/api2_2x/Library.c b/source/blender/python/api2_2x/Library.c index a9dd2c820ad..5881c88f654 100644 --- a/source/blender/python/api2_2x/Library.c +++ b/source/blender/python/api2_2x/Library.c @@ -604,15 +604,7 @@ PyObject *LibraryData_importLibData( BPy_LibraryData *self, char *name, */ if( mode != FILE_LINK ) { - ID *id; - ListBase *lbarray[MAX_LIBARRAY]; - int a; - - /* tag everything, all untagged data can be made local */ - 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); /* see what new block will be called */ strncpy( newName, name, strlen(name)+1 ); @@ -629,8 +621,12 @@ PyObject *LibraryData_importLibData( BPy_LibraryData *self, char *name, */ for( lib = G.main->library.first; lib; lib = lib->id.next ) if( strcmp( longFilename, lib->name ) == 0 ) { - if( mode != FILE_LINK ) + if( mode != FILE_LINK ) { 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, 0); + } break; } |