[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28022] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix #21577: incorrect camera selected when loading file without UI.

[Brecht Van Lommel]

Revision: 28022
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28022
Author:   blendix
Date:     2010-04-06 03:18:52 +0200 (Tue, 06 Apr 2010)

Log Message:
-----------
Fix #21577: incorrect camera selected when loading file without UI.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-06 01:16:39 UTC (rev 28021)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-06 01:18:52 UTC (rev 28022)
@@ -4757,7 +4757,10 @@
 					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);