diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2021-05-03 14:03:00 +0300 |
|---|---|---|
| committer | Alexander Gavrilov <angavrilov@gmail.com> | 2021-05-03 14:03:00 +0300 |
| commit | 2b46606af139171283c5a1ff0df0ee39fb78112e (patch) | |
| tree | 34d48e87ad43e277e17f699cf42042894f6b9c6f /source/blender/makesrna | |
| parent | ee8593fe76579df5e8f3460a8490632ec44578e9 (diff) | |
| parent | 6899dbef77cd26df3588888040887e4e41c1ec43 (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 7ef1904fc34..a4052430d9a 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -840,6 +840,8 @@ void RNA_def_material(BlenderRNA *brna) prop = RNA_def_property(srna, "node_tree", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "nodetree"); RNA_def_property_clear_flag(prop, PROP_PTR_NO_OWNERSHIP); + /* XXX: remove once overrides in material node trees are supported. */ + RNA_def_property_override_flag(prop, PROPOVERRIDE_IGNORE); RNA_def_property_ui_text(prop, "Node Tree", "Node tree for node based materials"); prop = RNA_def_property(srna, "use_nodes", PROP_BOOLEAN, PROP_NONE); |