diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-20 20:12:14 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-20 20:12:45 +0300 |
commit | 504319239aa4d6f319d94e3883ce9559f9c8448e (patch) | |
tree | 562199a409135a93b0526c74c9d20db05782b965 | |
parent | 410410f57ba3f1531f4786a824356a2de32db127 (diff) |
Cleanup: remove useless static override reference pointer from ID struct.
-rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 1bc3bf275cf..c35ca5c42e4 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -793,14 +793,6 @@ static int rna_ID_is_updated_data_get(PointerRNA *ptr) return ((data->recalc & ID_RECALC_ALL) != 0); } -static PointerRNA rna_ID_override_reference_get(PointerRNA *ptr) -{ - ID *id = (ID *)ptr->data; - ID *reference = (id && id->override_static) ? id->override_static->reference : NULL; - - return reference ? rna_pointer_inherit_refine(ptr, ID_code_to_RNA_type(GS(reference->name)), reference) : PointerRNA_NULL; -} - #else static void rna_def_ID_properties(BlenderRNA *brna) @@ -1012,15 +1004,14 @@ static void rna_def_ID_override_static_property(BlenderRNA *brna) static void rna_def_ID_override_static(BlenderRNA *brna) { StructRNA *srna; - PropertyRNA *prop; srna = RNA_def_struct(brna, "IDOverrideStatic", NULL); RNA_def_struct_ui_text(srna, "ID Static Override", "Struct gathering all data needed by statically overridden IDs"); - prop = RNA_def_pointer(srna, "reference", "ID", "Reference ID", "Linked ID used as reference by this override"); + RNA_def_pointer(srna, "reference", "ID", "Reference ID", "Linked ID used as reference by this override"); - prop = RNA_def_collection(srna, "properties", "IDOverrideStaticProperty", "Properties", - "List of overridden properties"); + RNA_def_collection(srna, "properties", "IDOverrideStaticProperty", "Properties", + "List of overridden properties"); rna_def_ID_override_static_property(brna); } @@ -1091,12 +1082,6 @@ static void rna_def_ID(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Library", "Library file the data-block is linked from"); - prop = RNA_def_pointer(srna, "override_static_reference", "ID", - "Override Reference", "Reference linked data-block overridden by this one"); - RNA_def_property_pointer_sdna(prop, NULL, "override_static->reference"); - RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_pointer_funcs(prop, "rna_ID_override_reference_get", NULL, NULL, NULL); - prop = RNA_def_pointer(srna, "override_static", "IDOverrideStatic", "Static Override", "Static override data"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); |