diff options
author | Alex Fraser <alex@phatcore.com> | 2011-10-26 14:49:21 +0400 |
---|---|---|
committer | Alex Fraser <alex@phatcore.com> | 2011-10-26 14:49:21 +0400 |
commit | f09d36d6bce6f2fb9f618f9bf57a91a3502ba3eb (patch) | |
tree | 3f693ae09a7d9352c8621b863ad10150b3d85cbc /source/blender/blenloader | |
parent | 944b07f5b7339f45bfb0bded22f64458cca3980b (diff) |
Fix [#28772] Filepaths are not remmaped after making a library item local
Added a visitor function to simplify processing of file paths that are attached to IDs. This is used for images, and could be used for other ID types in future.
Code reviewed by ideasman_42.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 45ab4a5cdaf..9ac0fab3b81 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10464,6 +10464,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) sce->gm.dome.warptext = sce->r.dometext; //Stand Alone + sce->gm.fullscreen = sce->r.fullscreen; sce->gm.xplay = sce->r.xplay; sce->gm.yplay = sce->r.yplay; sce->gm.freqplay = sce->r.freqplay; @@ -12190,22 +12191,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } - - { - /* Initialize BGE exit key to esc key */ - Scene *scene; - for(scene= main->scene.first; scene; scene= scene->id.next) { - if (!scene->gm.exitkey) - scene->gm.exitkey = 218; //218 is the Blender key code for ESC - } - } - - { - /* Initialize default values for collision masks */ - Object *ob; - for(ob=main->object.first; ob; ob=ob->id.next) - ob->col_group = ob->col_mask = 1; - } } /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ |