diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_define.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 3a5a1d30cd8..044162f7b6e 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -1655,6 +1655,20 @@ void RNA_def_property_string_default(PropertyRNA *prop, const char *value) case PROP_STRING: { StringPropertyRNA *sprop = (StringPropertyRNA *)prop; + + if (value == NULL) { + fprintf(stderr, "%s: \"%s.%s\", NULL string passed (dont call in this case).\n", __func__, srna->identifier, prop->identifier); + DefRNA.error = 1; + break; + } + + if (!value[0]) { + fprintf(stderr, "%s: \"%s.%s\", empty string passed (dont call in this case).\n", __func__, srna->identifier, prop->identifier); + DefRNA.error = 1; + // BLI_assert(0); + break; + } + sprop->defaultvalue = value; break; } @@ -2635,7 +2649,9 @@ PropertyRNA *RNA_def_string(StructOrFunctionRNA *cont_, const char *identifier, { ContainerRNA *cont = cont_; PropertyRNA *prop; - + + BLI_assert(default_value == NULL || default_value[0]); + prop = RNA_def_property(cont, identifier, PROP_STRING, PROP_NONE); if (maxlen != 0) RNA_def_property_string_maxlength(prop, maxlen); if (default_value) RNA_def_property_string_default(prop, default_value); @@ -2649,7 +2665,9 @@ PropertyRNA *RNA_def_string_file_path(StructOrFunctionRNA *cont_, const char *id { ContainerRNA *cont = cont_; PropertyRNA *prop; - + + BLI_assert(default_value == NULL || default_value[0]); + prop = RNA_def_property(cont, identifier, PROP_STRING, PROP_FILEPATH); if (maxlen != 0) RNA_def_property_string_maxlength(prop, maxlen); if (default_value) RNA_def_property_string_default(prop, default_value); @@ -2663,7 +2681,9 @@ PropertyRNA *RNA_def_string_dir_path(StructOrFunctionRNA *cont_, const char *ide { ContainerRNA *cont = cont_; PropertyRNA *prop; - + + BLI_assert(default_value == NULL || default_value[0]); + prop = RNA_def_property(cont, identifier, PROP_STRING, PROP_DIRPATH); if (maxlen != 0) RNA_def_property_string_maxlength(prop, maxlen); if (default_value) RNA_def_property_string_default(prop, default_value); @@ -2677,7 +2697,9 @@ PropertyRNA *RNA_def_string_file_name(StructOrFunctionRNA *cont_, const char *id { ContainerRNA *cont = cont_; PropertyRNA *prop; - + + BLI_assert(default_value == NULL || default_value[0]); + prop = RNA_def_property(cont, identifier, PROP_STRING, PROP_FILENAME); if (maxlen != 0) RNA_def_property_string_maxlength(prop, maxlen); if (default_value) RNA_def_property_string_default(prop, default_value); |