From 90ae533aa100b53a72db9f50aeefab47f9067b98 Mon Sep 17 00:00:00 2001 From: Pratik Borhade Date: Wed, 5 Feb 2025 09:48:00 +0100 Subject: [PATCH] Fix #101612: Viewport switched to perspective mode from camera view When camera view is active, regardless of camera view type, view changes to perspsective mode in local view. Now fixed with extra case of camera view type. Pull Request: https://projects.blender.org/blender/blender/pulls/132103 --- source/blender/editors/space_view3d/view3d_view.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/space_view3d/view3d_view.cc b/source/blender/editors/space_view3d/view3d_view.cc index 308e96fb873..59c06dc1bdc 100644 --- a/source/blender/editors/space_view3d/view3d_view.cc +++ b/source/blender/editors/space_view3d/view3d_view.cc @@ -50,6 +50,8 @@ #include "view3d_intern.hh" /* own include */ #include "view3d_navigate.hh" +#include "DNA_camera_types.h" + /* -------------------------------------------------------------------- */ /** \name Camera to View Operator * \{ */ @@ -901,8 +903,9 @@ static bool view3d_localview_init(const Depsgraph *depsgraph, negate_v3_v3(ofs_new, mid); if (rv3d->persp == RV3D_CAMOB) { - rv3d->persp = RV3D_PERSP; camera_old = v3d->camera; + const Camera &camera = *static_cast(camera_old->data); + rv3d->persp = (camera.type == CAM_ORTHO) ? RV3D_ORTHO : RV3D_PERSP; } if (rv3d->persp == RV3D_ORTHO) {