blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Fix T72751: Timeline crash from overridden scene. 

Depsgraph RNA pointer would generate infinite loop in override comparisons.

Depsgraph pointer should never be considered here anyway, this is purely
runtime data.
This commit is contained in:
Bastien Montagne 2020-02-19 16:07:21 +01:00
parent 8c5e36d0a9
commit e317e9f6c7
Notes: blender-bot 2023-02-14 07:40:56 +01:00 
Referenced by issue #72751, Timeline crash from overridden scene
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/RNA_types.h
View File

@ -292,6 +292,8 @@ typedef enum PropertyOverrideFlag {
/**
* Forbid usage of this property in comparison (& hence override) code.
* Useful e.g. for collections of data like mesh's geometry, particles, etc.
* Also for runtime data that should never be considered as part of actual Blend data (e.g.
* dpesgraph from ViewLayers...).
*/
PROPOVERRIDE_NO_COMPARISON = (1 << 1),

1
source/blender/makesrna/intern/rna_layer.c
View File

@ -595,6 +595,7 @@ void RNA_def_view_layer(BlenderRNA *brna)
/* Dependency Graph */
prop = RNA_def_property(srna, "depsgraph", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "Depsgraph");
RNA_def_property_override_flag(prop, PROPOVERRIDE_NO_COMPARISON);
RNA_def_property_ui_text(prop, "Dependency Graph", "Dependencies in the scene data");
RNA_def_property_pointer_funcs(prop, "rna_ViewLayer_depsgraph_get", NULL, NULL, NULL);