[Bf-blender-cvs] [907dd3d34a2] blender2.8: Fix crash in lamp preview render
Campbell Barton
noreply at git.blender.org
Sun Jul 8 21:18:07 CEST 2018
Commit: 907dd3d34a2f876622da1b4561df939a7d5836e9
Author: Campbell Barton
Date: Sun Jul 8 21:15:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB907dd3d34a2f876622da1b4561df939a7d5836e9
Fix crash in lamp preview render
Missing NULL check in object type filtering.
===================================================================
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 7e40966f9c8..a1e44e479d4 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1564,7 +1564,7 @@ void DRW_render_object_iter(
DRW_hair_init();
- const int object_type_exclude_viewport = draw_ctx->v3d->object_type_exclude_viewport;
+ const int object_type_exclude_viewport = draw_ctx->v3d ? draw_ctx->v3d->object_type_exclude_viewport : 0;
DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(depsgraph, ob)
{
if ((object_type_exclude_viewport & (1 << ob->type)) == 0) {
More information about the Bf-blender-cvs
mailing list