diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-30 16:15:16 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-30 16:15:16 +0400 |
| commit | 71446eea573db3ac6bac5f297c0655acbeada67c (patch) | |
| tree | 6bac99531e7c4ce7cc9d8b512920a037e444be32 /source/blender/blenloader | |
| parent | 253de0ed86f273d0032acbbd0b8237a358b35cbd (diff) | |
* Multiply for panorama cameras
* Some cases of struct name being set where it shouldnt have been.
* Spelling: wich --> which
* Copy and initialize uv modifier scale, remove unneeded enum.
* Ability to pin any object into the context.
* Update uv window while transforming (useful when used with UVProject modifier)
* Patch by Wahooney, so new template's are internal text and dont get saved over
by mistake.
* Fix for https://bugzilla.redhat.com/show_bug.cgi?id=572186
Bug 572186 - [abrt] crash in blender-2.49b-5.fc12: Process
/usr/bin/blender.bin was killed by signal 6 (SIGABRT). Original fix submitted
by Jochen Schmitt.
* [#21816] bpy.data.add_image has stopped working on Windows. moved to
bpy.data.images.load(), missed this call.
(commits 27726,27825,27828,27831,27832,27833,27834,27836,27837,27838,27839,27858 by Campbell from render25 branch)
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c6e3ef4767f..0ca21a68224 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -120,7 +120,7 @@ #include "BKE_group.h" #include "BKE_image.h" #include "BKE_lattice.h" -#include "BKE_library.h" // for wich_libbase +#include "BKE_library.h" // for which_libbase #include "BKE_main.h" // for Main #include "BKE_mesh.h" // for ME_ defines (patching) #include "BKE_modifier.h" @@ -429,7 +429,7 @@ static void split_libdata(ListBase *lb, Main *first) mainvar= first; while(mainvar) { if(mainvar->curlib==id->lib) { - lbn= wich_libbase(mainvar, GS(id->name)); + lbn= which_libbase(mainvar, GS(id->name)); BLI_remlink(lb, id); BLI_addtail(lbn, id); break; @@ -4684,7 +4684,7 @@ static void *restore_pointer_by_name(Main *mainp, ID *id, int user) { if(id) { - ListBase *lb= wich_libbase(mainp, GS(id->name)); + ListBase *lb= which_libbase(mainp, GS(id->name)); if(lb) { // there's still risk of checking corrupt mem (freed Ids in oops) ID *idn= lb->first; @@ -5377,10 +5377,10 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID /* do after read_struct, for dna reconstruct */ if(bhead->code==ID_ID) { - lb= wich_libbase(main, GS(id->name)); + lb= which_libbase(main, GS(id->name)); } else { - lb= wich_libbase(main, bhead->code); + lb= which_libbase(main, bhead->code); } BLI_addtail(lb, id); @@ -10959,8 +10959,8 @@ char *bhead_id_name(FileData *fd, BHead *bhead) static ID *is_yet_read(FileData *fd, Main *mainvar, BHead *bhead) { const char *idname= bhead_id_name(fd, bhead); - /* wich_libbase can be NULL, intentionally not using idname+2 */ - return BLI_findstring(wich_libbase(mainvar, GS(idname)), idname, offsetof(ID, name)); + /* which_libbase can be NULL, intentionally not using idname+2 */ + return BLI_findstring(which_libbase(mainvar, GS(idname)), idname, offsetof(ID, name)); } static void expand_doit(FileData *fd, Main *mainvar, void *old) |