diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-18 06:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-18 06:35:26 +0400 |
| commit | 96ada15d7940a72744dc1a63f13dbd9383b42a11 (patch) | |
| tree | 4e5527c0be1706fa28f715305d7f5b8eea4379ae /release | |
| parent | 1b5d16f1bf80f2da8d3d4da5bbfaf4819c14a225 (diff) | |
| parent | 5db33d11bd569f4040fd58e4f39cf97ed94fec29 (diff) | |
svn merge -r40197:40311 ^/trunk/blender
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/rna_info.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index 943f86adecb..d95c3920cf9 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -207,7 +207,7 @@ class InfoPropertyRNA: self.fixed_type = None if self.type == "enum": - self.enum_items[:] = rna_prop.enum_items.keys() + self.enum_items[:] = [(item.identifier, item.name, item.description) for item in rna_prop.enum_items] self.is_enum_flag = rna_prop.is_enum_flag else: self.is_enum_flag = False @@ -264,9 +264,9 @@ class InfoPropertyRNA: type_str += " in [%s, %s]" % (range_str(self.min), range_str(self.max)) elif self.type == "enum": if self.is_enum_flag: - type_str += " set in {%s}" % ", ".join(("'%s'" % s) for s in self.enum_items) + type_str += " set in {%s}" % ", ".join(("'%s'" % s[0]) for s in self.enum_items) else: - type_str += " in [%s]" % ", ".join(("'%s'" % s) for s in self.enum_items) + type_str += " in [%s]" % ", ".join(("'%s'" % s[0]) for s in self.enum_items) if not (as_arg or as_ret): # write default property, ignore function args for this |