[Bf-blender-cvs] [e92cf80a5c8] blender2.8: Fix for last commit

[Campbell Barton]

Commit: e92cf80a5c8ead0cfc87364e61136e34b7215775
Author: Campbell Barton
Date:   Thu Aug 3 18:09:11 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBe92cf80a5c8ead0cfc87364e61136e34b7215775

Fix for last commit

Missed check for non-camera view frame

===================================================================

M       source/blender/editors/space_view3d/view3d_manipulator_camera.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_manipulator_camera.c 
b/source/blender/editors/space_view3d/view3d_manipulator_camera.c
index 5281b212e4c..856a697cf45 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_camera.c
+++ b/source/blender/editors/space_view3d/view3d_manipulator_camera.c
@@ -343,9 +343,14 @@ static void WIDGETGROUP_camera_view_draw_prepare(const 
bContext *C, wmManipulato
 
        ARegion *ar = CTX_wm_region(C);
        RegionView3D *rv3d = ar->regiondata;
-       Scene *scene = CTX_data_scene(C);
        View3D *v3d = CTX_wm_view3d(C);
-       ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, 
&viewgroup->state.view_border, false);
+       if (rv3d->persp == RV3D_CAMOB) {
+               Scene *scene = CTX_data_scene(C);
+               ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, 
&viewgroup->state.view_border, false);
+       }
+       else {
+               viewgroup->state.view_border = (rctf){.xmin = 0, .ymin = 0, 
.xmax = ar->winx, .ymax = ar->winy};
+       }
 }
 
 static void WIDGETGROUP_camera_view_refresh(const bContext *C, 
wmManipulatorGroup *mgroup)

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