diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-29 18:19:03 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-29 21:03:47 +0300 |
commit | 4c7f08e5ebc107e13501a5b1e82a44edeaf7b7c3 (patch) | |
tree | d99a568556f4595b827229c89a358260803a8252 /source/blender | |
parent | bb770a2c85ffc76018aa28a4a941df1c6081530e (diff) |
Cleanup: remove unused RNA flag.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesrna/RNA_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 26 |
3 files changed, 15 insertions, 17 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index f71969d0307..0e7c3956d7b 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -237,7 +237,6 @@ typedef enum PropertyFlag { * most common case is functions that return arrays where the array */ PROP_THICK_WRAP = (1 << 23), - PROP_EXPORT = (1 << 8), /* XXX Is this still used? makesrna.c seems to ignore it currently... */ PROP_IDPROPERTY = (1 << 10), /* This is an IDProperty, not a DNA one. */ PROP_DYNAMIC = (1 << 17), /* for dynamic arrays, and retvals of type string */ PROP_ENUM_NO_CONTEXT = (1 << 24), /* for enum that shouldn't be contextual */ diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index e5644d10add..fbdb8abd3b0 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -2666,7 +2666,7 @@ static void rna_generate_property_prototypes(BlenderRNA *UNUSED(brna), StructRNA fprintf(f, "\n"); for (prop = srna->cont.properties.first; prop; prop = prop->next) - fprintf(f, "%s%s rna_%s_%s;\n", (prop->flag & PROP_EXPORT) ? "" : "", rna_property_structname(prop->type), + fprintf(f, "%s rna_%s_%s;\n", rna_property_structname(prop->type), srna->identifier, prop->identifier); fprintf(f, "\n"); } @@ -3061,8 +3061,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr break; } - fprintf(f, "%s%s rna_%s%s_%s = {\n", - (prop->flag & PROP_EXPORT) ? "" : "", + fprintf(f, "%s rna_%s%s_%s = {\n", rna_property_structname(prop->type), srna->identifier, strnest, prop->identifier); diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 463214fd4fd..5f398b0c008 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -840,52 +840,52 @@ static void rna_def_ID_properties(BlenderRNA *brna) /* IDP_STRING */ prop = RNA_def_property(srna, "string", PROP_STRING, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); /* IDP_INT */ prop = RNA_def_property(srna, "int", PROP_INT, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); prop = RNA_def_property(srna, "int_array", PROP_INT, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); RNA_def_property_array(prop, 1); /* IDP_FLOAT */ prop = RNA_def_property(srna, "float", PROP_FLOAT, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); prop = RNA_def_property(srna, "float_array", PROP_FLOAT, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); RNA_def_property_array(prop, 1); /* IDP_DOUBLE */ prop = RNA_def_property(srna, "double", PROP_FLOAT, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); prop = RNA_def_property(srna, "double_array", PROP_FLOAT, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); RNA_def_property_array(prop, 1); /* IDP_GROUP */ prop = RNA_def_property(srna, "group", PROP_POINTER, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_struct_type(prop, "PropertyGroup"); prop = RNA_def_property(srna, "collection", PROP_COLLECTION, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); RNA_def_property_struct_type(prop, "PropertyGroup"); prop = RNA_def_property(srna, "idp_array", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "PropertyGroup"); RNA_def_property_collection_funcs(prop, "rna_IDPArray_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_IDPArray_length", NULL, NULL, NULL); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); /* never tested, maybe its useful to have this? */ #if 0 prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Name", "Unique name used in the code and scripting"); RNA_def_struct_name_property(srna, prop); @@ -893,7 +893,7 @@ static void rna_def_ID_properties(BlenderRNA *brna) /* IDP_ID */ prop = RNA_def_property(srna, "id", PROP_POINTER, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY | PROP_NEVER_UNLINK); + RNA_def_property_flag(prop, PROP_IDPROPERTY | PROP_NEVER_UNLINK); RNA_def_property_struct_type(prop, "ID"); @@ -911,7 +911,7 @@ static void rna_def_ID_properties(BlenderRNA *brna) * however this isn't prefect because it overrides how python would set the name * when we only really want this so RNA_def_struct_name_property() is set to something useful */ prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - RNA_def_property_flag(prop, PROP_EXPORT | PROP_IDPROPERTY); + RNA_def_property_flag(prop, PROP_IDPROPERTY); /*RNA_def_property_clear_flag(prop, PROP_EDITABLE); */ RNA_def_property_ui_text(prop, "Name", "Unique name used in the code and scripting"); RNA_def_struct_name_property(srna, prop); |