griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix error setting quadview when there is no camera in the scene, the view would glitch/jump when accessing afterwards.

Browse Source
This commit is contained in:
Campbell Barton
2012-10-10 08:47:53 +00:00
parent 33489b3b74
commit 7c351d3d09
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/screen/screen_ops.c
View File

@@ -2716,6 +2716,8 @@ static int region_quadview_exec(bContext *C, wmOperator *op)
/* lock views and set them */
if (sa->spacetype == SPACE_VIEW3D) {
View3D *v3d = sa->spacedata.first;
/* run ED_view3d_lock() so the correct 'rv3d->viewquat' is set,
* otherwise when restoring rv3d->localvd the 'viewquat' won't
* match the 'view', set on entering localview See: [#26315],
@@ -2743,7 +2745,15 @@ static int region_quadview_exec(bContext *C, wmOperator *op)
ar = ar->next;
rv3d = ar->regiondata;
rv3d->view = RV3D_VIEW_CAMERA; rv3d->persp = RV3D_CAMOB;
/* check if we have a camera */
if (v3d->camera) {
rv3d->view = RV3D_VIEW_CAMERA; rv3d->persp = RV3D_CAMOB;
}
else {
rv3d->view = RV3D_VIEW_PERSPORTHO; rv3d->persp = RV3D_PERSP;
}
ED_view3d_lock(rv3d);
view3d_localview_update_rv3d(rv3d);
}