Revision: 51247
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51247
Author:   campbellbarton
Date:     2012-10-10 08:46:52 +0000 (Wed, 10 Oct 2012)
Log Message:
-----------
fix for crash when entering fly mode in a camera view that has no camera (rare 
but possible situation).

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

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c      
2012-10-10 08:46:07 UTC (rev 51246)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c      
2012-10-10 08:46:52 UTC (rev 51247)
@@ -284,6 +284,11 @@
        puts("\n-- fly begin --");
 #endif
 
+       /* sanity check: for rare but possible case (if lib-linking the camera 
fails) */
+       if ((fly->rv3d->persp == RV3D_CAMOB) && (fly->v3d->camera == NULL)) {
+               fly->rv3d->persp = RV3D_PERSP;
+       }
+
        if (fly->rv3d->persp == RV3D_CAMOB && fly->v3d->camera->id.lib) {
                BKE_report(op->reports, RPT_ERROR, "Cannot fly a camera from an 
external library");
                return FALSE;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to