[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28606] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: Fix [#22249] Can enter camera view when there is no camera in scene

[Matt Ebb]

Revision: 28606
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28606
Author:   broken
Date:     2010-05-06 05:49:26 +0200 (Thu, 06 May 2010)

Log Message:
-----------
Fix [#22249] Can enter camera view when there is no camera in scene

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c     
2010-05-06 03:26:46 UTC (rev 28605)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c     
2010-05-06 03:49:26 UTC (rev 28606)
@@ -1893,7 +1893,8 @@
 
                                        if(v3d->camera==NULL) {
                                                v3d->camera= 
scene_find_camera(scene);
-                                               /*handle_view3d_lock();*/
+                                               if (v3d->camera == NULL)
+                                                       return 
OPERATOR_CANCELLED;
                                        }
                                        rv3d->persp= RV3D_CAMOB;
                                        smooth_view(C, NULL, v3d->camera, 
rv3d->ofs, rv3d->viewquat, &rv3d->dist, &v3d->lens);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs