blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

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.
This commit is contained in:
Campbell Barton 2020-09-13 15:28:41 +10:00
parent b52aeaadfb
commit ca39325826
Notes: blender-bot 2023-02-14 03:23:46 +01:00 
Referenced by issue #80396, Potential candidates for corrective releases
Referenced by issue #77348, Blender LTS: Maintenance Task 2.83
Referenced by issue #62504, Access violation trying to access C.evaluated_get().view_layer_eval.depsgraph
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/makesrna/intern/rna_depsgraph.c
View File

@ -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