diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 16:40:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 16:40:15 +0400 |
commit | 0d63bb005ff7c45ca0ebcfbe4eaf1215dfe2d3e2 (patch) | |
tree | 39e55a1385696d10833080d7482ada1e031f9bd9 /source/blender/blenloader/intern/readfile.c | |
parent | 565fcd8907c4cbd105bef9330e13ccbd893a6f3e (diff) |
replace VECCOPY and QUATCOPY with inline funcs.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 45ab4a5cdaf..16da7321524 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5319,8 +5319,8 @@ static void view3d_split_250(View3D *v3d, ListBase *regions) rv3d->persp= v3d->persp; rv3d->view= v3d->view; rv3d->dist= v3d->dist; - VECCOPY(rv3d->ofs, v3d->ofs); - QUATCOPY(rv3d->viewquat, v3d->viewquat); + copy_v3_v3(rv3d->ofs, v3d->ofs); + copy_qt_qt(rv3d->viewquat, v3d->viewquat); } } @@ -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! */ |