Merge from 2.5 -r 21285:21515. Thanks Joshua!

2009-07-11 09:14:12 +00:00
parent 797c6a2295 a7287165db
commit 3ad64726ee
322 changed files with 30831 additions and 19510 deletions
--- a/source/blender/python/intern/bpy_util.c
+++ b/source/blender/python/intern/bpy_util.c
@@ -417,7 +417,8 @@ char *BPy_enum_as_string(EnumPropertyItem *item)
 	char *cstring;

 	for (e= item; item->identifier; item++) {
-		BLI_dynstr_appendf(dynstr, (e==item)?"'%s'":", '%s'", item->identifier);
+		if(item->identifier[0])
+			BLI_dynstr_appendf(dynstr, (e==item)?"'%s'":", '%s'", item->identifier);
 	}

 	cstring = BLI_dynstr_get_cstring(dynstr);