Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2015-04-27 16:39:09 +0300
committerDalai Felinto <dfelinto@gmail.com>2015-04-27 16:41:40 +0300
commitf809eef968c997dc00ffccd10bb0b1221d66d05a (patch)
tree92fc803a528ee7231c55a703a6528c8d13d60569
parentb315fcb7edb7222c97facc2413d3772702533dd2 (diff)
Muti-View: viewport crashes when empty is active camera - reported over IRC by Campbell Barton
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 520ad4f89b4..af0bd8ec761 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3570,7 +3570,7 @@ static bool view3d_stereo3d_active(const bContext *C, Scene *scene, View3D *v3d,
if (WM_stereo3d_enabled(win, true) == false)
return false;
- if ((v3d->camera == NULL) || rv3d->persp != RV3D_CAMOB)
+ if ((v3d->camera == NULL) || (v3d->camera->type != OB_CAMERA) || rv3d->persp != RV3D_CAMOB)
return false;
if (scene->r.views_format & SCE_VIEWS_FORMAT_MULTIVIEW) {