[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40621] trunk/blender/source/blender: fix [#28751] Item in Enum propertie is grayed out

Campbell Barton ideasman42 at gmail.com
Tue Sep 27 18:23:41 CEST 2011


Revision: 40621
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40621
Author:   campbellbarton
Date:     2011-09-27 16:23:40 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
fix [#28751] Item in Enum propertie is grayed out

was infact a very old bug where an empty title took the following word for the title, eg: "%t|First Item|Second Item"
the first item would be evaluated as a title.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_regions.c
    trunk/blender/source/blender/python/intern/bpy_props.c

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2011-09-27 14:24:32 UTC (rev 40620)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2011-09-27 16:23:40 UTC (rev 40621)
@@ -174,7 +174,7 @@
 				*s= '\0';
 				s++;
 			} else if (s[1]=='t') {
-				nitem_is_title= 1;
+				nitem_is_title= (s[2] != '|'); /* check for empty title */
 
 				*s= '\0';
 				s++;

Modified: trunk/blender/source/blender/python/intern/bpy_props.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_props.c	2011-09-27 14:24:32 UTC (rev 40620)
+++ trunk/blender/source/blender/python/intern/bpy_props.c	2011-09-27 16:23:40 UTC (rev 40621)
@@ -973,7 +973,7 @@
 
 			PyErr_Format(PyExc_TypeError,
 			             "EnumProperty(..., default=\'%s\'): not found in enum members",
-			             def);
+			             def_cmp);
 			return NULL;
 		}
 	}




More information about the Bf-blender-cvs mailing list