From cd317fab65e1b6c1652ba7a58786a8cc5bd11843 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 1 Feb 2018 12:09:22 +0100 Subject: Fix wrong attempt to get depsgraph from RNA Groups ViewLayer. --- source/blender/makesrna/intern/rna_layer.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index 131378b5c49..68c4a15e06b 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -843,10 +843,14 @@ static int rna_ViewLayer_objects_selected_skip(CollectionPropertyIterator *iter, static PointerRNA rna_ViewLayer_depsgraph_get(PointerRNA *ptr) { - Scene *scene = (Scene *)ptr->id.data; - ViewLayer *view_layer = (ViewLayer *)ptr->data; - Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false); - return rna_pointer_inherit_refine(ptr, &RNA_Depsgraph, depsgraph); + ID *id = ptr->id.data; + if (GS(id->name) == ID_SCE) { + Scene *scene = (Scene *)id; + ViewLayer *view_layer = (ViewLayer *)ptr->data; + Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false); + return rna_pointer_inherit_refine(ptr, &RNA_Depsgraph, depsgraph); + } + return PointerRNA_NULL; } static void rna_LayerObjects_selected_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) -- cgit v1.2.3