[Bf-blender-cvs] [f809eef] master: Muti-View: viewport crashes when empty is active camera - reported over IRC by Campbell Barton

Dalai Felinto noreply at git.blender.org
Mon Apr 27 15:45:58 CEST 2015


Commit: f809eef968c997dc00ffccd10bb0b1221d66d05a
Author: Dalai Felinto
Date:   Mon Apr 27 10:39:09 2015 -0300
Branches: master
https://developer.blender.org/rBf809eef968c997dc00ffccd10bb0b1221d66d05a

Muti-View: viewport crashes when empty is active camera - reported over IRC by Campbell Barton

===================================================================

M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 520ad4f..af0bd8e 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) {




More information about the Bf-blender-cvs mailing list