[Bf-blender-cvs] [cd49afc596a] master: Fix T82596: Fly/walk navigation crash
Hans Goudey
noreply at git.blender.org
Thu Nov 12 23:07:09 CET 2020
Commit: cd49afc596a0b24ce9e0045afb03906aca481b9a
Author: Hans Goudey
Date: Thu Nov 12 17:06:57 2020 -0500
Branches: master
https://developer.blender.org/rBcd49afc596a0b24ce9e0045afb03906aca481b9a
Fix T82596: Fly/walk navigation crash
Add a NULL check for the View3D's camera, because these
modes can be entered even without an active camera.
===================================================================
M source/blender/editors/space_view3d/view3d_camera_control.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c
index bce0e49d60a..11643960595 100644
--- a/source/blender/editors/space_view3d/view3d_camera_control.c
+++ b/source/blender/editors/space_view3d/view3d_camera_control.c
@@ -138,7 +138,8 @@ struct View3DCameraControl *ED_view3d_cameracontrol_acquire(Depsgraph *depsgraph
vctrl->ctx_v3d = v3d;
vctrl->ctx_rv3d = rv3d;
- vctrl->use_parent_root = v3d->camera->transflag & OB_TRANSFORM_ADJUST_ROOT_PARENT_FOR_VIEW_LOCK;
+ vctrl->use_parent_root = v3d->camera != NULL &&
+ v3d->camera->transflag & OB_TRANSFORM_ADJUST_ROOT_PARENT_FOR_VIEW_LOCK;
vctrl->persp_backup = rv3d->persp;
vctrl->dist_backup = rv3d->dist;
More information about the Bf-blender-cvs
mailing list