diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-06-22 11:23:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-29 16:46:31 +0300 |
| commit | 45253222eef387124fed99cb2f8769eb1c447299 (patch) | |
| tree | af080d0af80477a783be36e5273b86983a673fff | |
| parent | 39e09b842b5c9ba456420e3258c615da533add2d (diff) | |
Fix camera stereo logic use /w regular select
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 220cea230cd..a96274bf64d 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -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) |