Commit: 03a4d3c33f824f966675dbb8fe3b4d645dc88f42
Author: Julian Eisel
Date:   Wed Feb 19 20:45:58 2020 +0100
Branches: master
https://developer.blender.org/rB03a4d3c33f824f966675dbb8fe3b4d645dc88f42

RNA: Fail makesrna if enum identifiers contain spaces

We could of course always add checks for more invalid characters, but
I'd say they are more unlikely to happen.

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

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

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

diff --git a/source/blender/makesrna/intern/rna_define.c 
b/source/blender/makesrna/intern/rna_define.c
index 73a59cbba11..4150daa0f63 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -1832,8 +1832,18 @@ void RNA_def_property_enum_items(PropertyRNA *prop, 
const EnumPropertyItem *item
       for (i = 0; item[i].identifier; i++) {
         eprop->totitem++;
 
-        if (item[i].identifier[0] && item[i].value == eprop->defaultvalue) {
-          defaultfound = 1;
+        if (item[i].identifier[0]) {
+          if (strstr(item[i].identifier, " ")) {
+            CLOG_ERROR(&LOG,
+                       "\"%s.%s\", enum identifiers must not contain spaces.",
+                       srna->identifier,
+                       prop->identifier);
+            DefRNA.error = 1;
+            break;
+          }
+          else if (item[i].value == eprop->defaultvalue) {
+            defaultfound = 1;
+          }
         }
       }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to