[Bf-blender-cvs] [4c5c103] multiview: Bugfix: ammend from previous commit, camera border was still failing in some cases
Dalai Felinto
noreply at git.blender.org
Tue Nov 25 22:27:51 CET 2014
Commit: 4c5c103258ca0b9e442aed1b32e50fb61131a175
Author: Dalai Felinto
Date: Tue Nov 25 19:27:32 2014 -0200
Branches: multiview
https://developer.blender.org/rB4c5c103258ca0b9e442aed1b32e50fb61131a175
Bugfix: ammend from previous commit, camera border was still failing in some cases
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 9d9484b..e91928c 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1988,8 +1988,9 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
const bool is_stereo3d = drawcamera_is_stereo3d(scene, v3d, ob);
const bool is_stereo3d_cameras = (ob == scene->camera) &&
- (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS) &&
- (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D);
+ (scene->r.scemode & R_MULTIVIEW) &&
+ (scene->r.views_setup == SCE_VIEWS_SETUP_STEREO_3D) &&
+ (v3d->stereo3d_flag & V3D_S3D_DISPCAMERAS);
/* draw data for movie clip set as active for scene */
if (clip) {
More information about the Bf-blender-cvs
mailing list