[Bf-blender-cvs] [fffe219bdb8] master: LibOverride: Make nodetree of material overrideable again.

Bastien Montagne noreply at git.blender.org
Wed Aug 18 16:53:58 CEST 2021


Commit: fffe219bdb8d12e1c6a06bb38e68150ab9e40038
Author: Bastien Montagne
Date:   Wed Aug 18 16:46:12 2021 +0200
Branches: master
https://developer.blender.org/rBfffe219bdb8d12e1c6a06bb38e68150ab9e40038

LibOverride: Make nodetree of material overrideable again.

This reverts rB6899dbef77cd and makes the pointer explicitely
processable by override & diffing code.

Previous changes & fixes have fixed the 'driver-workaround' case afaict.

Note that this only enables proper generic handling of overrides and
their ID pointers, no node property is actually overridable currently.

===================================================================

M	source/blender/makesrna/intern/rna_material.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index d91c0bfaf29..ee31b92b2a1 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -850,7 +850,7 @@ void RNA_def_material(BlenderRNA *brna)
   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_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
   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);



More information about the Bf-blender-cvs mailing list