blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix camera stereo logic use /w regular select

This commit is contained in:
Campbell Barton 2015-06-22 18:23:59 +10:00
parent c119187be0
commit 63c9f51133
Notes: blender-bot 2023-02-14 08:59:09 +01:00 
Referenced by issue #45145, Camera scale bug - Cannot select when camera scale != 1 & looking through camera
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_view3d/drawobject.c
View File

@ -2053,12 +2053,13 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
float vec[4][3], asp[2], shift[2], scale[3];
int i;
float drawsize;
const bool is_view = (rv3d->persp == RV3D_CAMOB && ob == v3d->camera);
MovieClip *clip = BKE_object_movieclip_get(scene, base->object, false);
const bool is_view = (rv3d->persp == RV3D_CAMOB && ob == v3d->camera);
const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
const bool is_stereo3d = drawcamera_is_stereo3d(scene, v3d, ob);
const bool is_stereo3d_cameras = (ob == scene->camera) &&
(scene->r.scemode & R_MULTIVIEW) &&
is_multiview &&
(scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D) &&
(v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS);
@ -2100,7 +2101,9 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
/* camera frame */
if (!is_stereo3d_cameras) {
/* make sure selection uses the same matrix for camera as the one used while viewing */
if ((G.f & G_PICKSEL) && is_view && (scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D)) {
if ((G.f & G_PICKSEL) && is_view && is_multiview &&
(scene->r.views_format == SCE_VIEWS_FORMAT_STEREO_3D))
{
float obmat[4][4];
bool is_left = v3d->multiview_eye == STEREO_LEFT_ID;
@ -2112,8 +2115,9 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
drawcamera_frame(vec, GL_LINE_LOOP);
glPopMatrix();
}
else
else {
drawcamera_frame(vec, GL_LINE_LOOP);
}
}
if (is_view)