[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34348] trunk/blender/source/blender/ python/intern/bpy_props.c: Defining bpy.props.EnumProperty(...

[Campbell Barton]

Revision: 34348
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34348
Author:   campbellbarton
Date:     2011-01-16 10:08:20 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
Defining bpy.props.EnumProperty(... , options={'ENUM_FLAG'}) wasnt working right with default values.

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

Modified: trunk/blender/source/blender/python/intern/bpy_props.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_props.c	2011-01-16 06:16:28 UTC (rev 34347)
+++ trunk/blender/source/blender/python/intern/bpy_props.c	2011-01-16 10:08:20 UTC (rev 34348)
@@ -676,11 +676,12 @@
 		if(!eitems)
 			return NULL;
 
-		prop= RNA_def_enum(srna, id, eitems, defvalue, name, description);
+		if(opts & PROP_ENUM_FLAG)	prop= RNA_def_enum_flag(srna, id, eitems, defvalue, name, description);
+		else						prop= RNA_def_enum(srna, id, eitems, defvalue, name, description);
+
 		if(pyopts) {
 			if(opts & PROP_HIDDEN) RNA_def_property_flag(prop, PROP_HIDDEN);
 			if((opts & PROP_ANIMATABLE)==0) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-			if(opts & PROP_ENUM_FLAG) RNA_def_property_flag(prop, PROP_ENUM_FLAG);
 		}
 		RNA_def_property_duplicate_pointers(srna, prop);
 		MEM_freeN(eitems);