diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-06 05:18:52 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-06 05:18:52 +0400 |
| commit | 1c1d10f2857036875777f10be1d22d7db392eba4 (patch) | |
| tree | a4076f9e658b2feb9dfbee42264e5ad536b9b5c3 /source/blender/blenloader | |
| parent | 93cc8eea452adb32bb90d1b5056b4456f30aa30c (diff) | |
Fix #21577: incorrect camera selected when loading file without UI.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index dcd7d9d0dab..1f6d36dc957 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4757,7 +4757,10 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene) View3D *v3d= (View3D*) sl; BGpic *bgpic; - v3d->camera= restore_pointer_by_name(newmain, (ID *)v3d->camera, 1); + if(v3d->scenelock) + v3d->camera= NULL; /* always get from scene */ + else + v3d->camera= restore_pointer_by_name(newmain, (ID *)v3d->camera, 1); if(v3d->camera==NULL) v3d->camera= sc->scene->camera; v3d->ob_centre= restore_pointer_by_name(newmain, (ID *)v3d->ob_centre, 1); |