[Bf-blender-cvs] [055c0f90773] blender-v2.83-release: Fix T62504: Crash accessing depsgraph from evaluated view layer
Campbell Barton
noreply at git.blender.org
Wed Oct 7 10:23:18 CEST 2020
Commit: 055c0f907733a070e3ecc6484981742fa7f433dd
Author: Campbell Barton
Date: Sun Sep 13 15:28:41 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB055c0f907733a070e3ecc6484981742fa7f433dd
Fix T62504: Crash accessing depsgraph from evaluated view layer
Use correct owner_id types for depsgraph view_layer properties
instead of inheriting from the Depsgraph which is set to NULL.
===================================================================
M source/blender/makesrna/intern/rna_depsgraph.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index ca34f69ab1e..e47b6957d35 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -43,6 +43,8 @@
# include "BLI_iterator.h"
# include "BLI_math.h"
+# include "RNA_access.h"
+
# include "BKE_duplilist.h"
# include "BKE_object.h"
# include "BKE_scene.h"
@@ -461,14 +463,19 @@ static PointerRNA rna_Depsgraph_scene_get(PointerRNA *ptr)
{
Depsgraph *depsgraph = (Depsgraph *)ptr->data;
Scene *scene = DEG_get_input_scene(depsgraph);
- return rna_pointer_inherit_refine(ptr, &RNA_Scene, scene);
+ PointerRNA newptr;
+ RNA_pointer_create(&scene->id, &RNA_Scene, scene, &newptr);
+ return newptr;
}
static PointerRNA rna_Depsgraph_view_layer_get(PointerRNA *ptr)
{
Depsgraph *depsgraph = (Depsgraph *)ptr->data;
+ Scene *scene = DEG_get_input_scene(depsgraph);
ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph);
- return rna_pointer_inherit_refine(ptr, &RNA_ViewLayer, view_layer);
+ PointerRNA newptr;
+ RNA_pointer_create(&scene->id, &RNA_ViewLayer, view_layer, &newptr);
+ return newptr;
}
static PointerRNA rna_Depsgraph_scene_eval_get(PointerRNA *ptr)
@@ -476,13 +483,19 @@ static PointerRNA rna_Depsgraph_scene_eval_get(PointerRNA *ptr)
Depsgraph *depsgraph = (Depsgraph *)ptr->data;
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
return rna_pointer_inherit_refine(ptr, &RNA_Scene, scene_eval);
+ PointerRNA newptr;
+ RNA_pointer_create(&scene_eval->id, &RNA_Scene, scene_eval, &newptr);
+ return newptr;
}
static PointerRNA rna_Depsgraph_view_layer_eval_get(PointerRNA *ptr)
{
Depsgraph *depsgraph = (Depsgraph *)ptr->data;
+ Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph);
- return rna_pointer_inherit_refine(ptr, &RNA_ViewLayer, view_layer_eval);
+ PointerRNA newptr;
+ RNA_pointer_create(&scene_eval->id, &RNA_ViewLayer, view_layer_eval, &newptr);
+ return newptr;
}
#else
More information about the Bf-blender-cvs
mailing list