From 7f0a8bcbbca88a090bd0d3233675bbc19c817666 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 13 Jul 2023 09:54:00 +1000 Subject: [PATCH] Cleanup: quiet warnings --- source/blender/editors/screen/screen_edit.cc | 2 +- source/blender/editors/space_view3d/view3d_utils.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc index 35b5b5c13cb..84d2976ea0a 100644 --- a/source/blender/editors/screen/screen_edit.cc +++ b/source/blender/editors/screen/screen_edit.cc @@ -1415,7 +1415,7 @@ void ED_screen_full_restore(bContext *C, ScrArea *area) wmWindow *win = CTX_wm_window(C); SpaceLink *sl = static_cast(area->spacedata.first); bScreen *screen = CTX_wm_screen(C); - short state = (screen ? screen->state : SCREENMAXIMIZED); + short state = (screen ? screen->state : short(SCREENMAXIMIZED)); /* If full-screen area has a temporary space (such as a file browser or full-screen render * overlaid on top of an existing setup) then return to the previous space. */ diff --git a/source/blender/editors/space_view3d/view3d_utils.cc b/source/blender/editors/space_view3d/view3d_utils.cc index 98d2d1a1aef..8d0543c2b93 100644 --- a/source/blender/editors/space_view3d/view3d_utils.cc +++ b/source/blender/editors/space_view3d/view3d_utils.cc @@ -493,7 +493,7 @@ bool ED_view3d_persp_ensure(const Depsgraph *depsgraph, View3D *v3d, ARegion *re if (rv3d->persp == RV3D_CAMOB) { /* If autopersp and previous view was an axis one, * switch back to PERSP mode, else reuse previous mode. */ - char persp = (autopersp && RV3D_VIEW_IS_AXIS(rv3d->lview)) ? RV3D_PERSP : rv3d->lpersp; + char persp = (autopersp && RV3D_VIEW_IS_AXIS(rv3d->lview)) ? char(RV3D_PERSP) : rv3d->lpersp; ED_view3d_persp_switch_from_camera(depsgraph, v3d, rv3d, persp); } else if (autopersp && RV3D_VIEW_IS_AXIS(rv3d->view)) {