Commit: de87411544e14c33b8ad6c026eb27857cd1f5ad6
Author: Bastien Montagne
Date: Tue Dec 13 17:42:01 2016 +0100
Branches: id_override_static
https://developer.blender.org/rBde87411544e14c33b8ad6c026eb27857cd1f5ad6
Revert initial hack to get a new overridable RNA prop flag.
Now that we have some new free ones...
===================================================================
M source/blender/makesrna/RNA_types.h
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_ID.c
===================================================================
diff --git a/source/blender/makesrna/RNA_types.h
b/source/blender/makesrna/RNA_types.h
index 17cd79b..4b9b5aa 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -156,7 +156,7 @@ typedef enum PropertySubType {
/* Make sure enums are updated with these */
/* HIGHEST FLAG IN USE: 1 << 31
- * FREE FLAGS: 2, 3, 7, 9, 11, 13, 14, 15, 30 */
+ * FREE FLAGS: 3, 7, 9, 11, 13, 14, 15, 30 */
typedef enum PropertyFlag {
/* editable means the property is editable in the user
* interface, properties are editable by default except
@@ -175,7 +175,7 @@ typedef enum PropertyFlag {
PROP_ANIMATABLE = (1 << 1),
/* Means the property can be overriden by a local 'proxy' of some
linked datablock. */
- PROP_OVERRIDABLE = (1 << 8),
+ PROP_OVERRIDABLE = (1 << 2),
/* This flag means when the property's widget is in 'textedit' mode, it
will be updated after every typed char,
* instead of waiting final validation. Used e.g. for text searchbox. */
diff --git a/source/blender/makesrna/intern/makesrna.c
b/source/blender/makesrna/intern/makesrna.c
index a4f2383..d557697 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -2614,7 +2614,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)*/false ? "" : "", rna_property_structname(prop->type),
+ fprintf(f, "%s%s rna_%s_%s;\n", (prop->flag & PROP_EXPORT) ? ""
: "", rna_property_structname(prop->type),
srna->identifier, prop->identifier);
fprintf(f, "\n");
}
@@ -2984,7 +2984,7 @@ static void rna_generate_property(FILE *f, StructRNA
*srna, const char *nest, Pr
}
fprintf(f, "%s%s rna_%s%s_%s = {\n",
- /*(prop->flag & PROP_EXPORT)*/false ? "" : "",
+ (prop->flag & PROP_EXPORT) ? "" : "",
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 6404419..ea314e8 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -759,52 +759,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_EXPORT | 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_EXPORT | 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_EXPORT | 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_EXPORT | 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_EXPORT | 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_EXPORT | 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_EXPORT | 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_EXPORT | 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_EXPORT | 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_EXPORT | 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_EXPORT | 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);
@@ -826,7 +826,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_EXPORT | 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
