[Bf-blender-cvs] [1fad887d9e2] blender2.8: Fix T57130: Crash when running 'set active object as camera' on an empty

Philipp Oeser noreply at git.blender.org
Wed Oct 10 14:35:37 CEST 2018


Commit: 1fad887d9e22da97009f28288cc6f21cc32a6c37
Author: Philipp Oeser
Date:   Wed Oct 10 14:30:44 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1fad887d9e22da97009f28288cc6f21cc32a6c37

Fix T57130: Crash when running 'set active object as camera' on an empty

Reviewed By: brecht

https://developer.blender.org/D3782

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

M	source/blender/draw/modes/object_mode.c

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

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 2901a718d59..20abfbf3348 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -634,7 +634,7 @@ static void OBJECT_engine_init(void *vedata)
 		}
 
 		float dist;
-		if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
+		if (rv3d->persp == RV3D_CAMOB && v3d->camera && v3d->camera->type == OB_CAMERA) {
 			Object *camera_object = DEG_get_evaluated_object(draw_ctx->depsgraph, v3d->camera);
 			dist = ((Camera *)(camera_object->data))->clipend;
 		}



More information about the Bf-blender-cvs mailing list