diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-19 14:48:15 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-19 14:48:15 +0400 |
| commit | 1c0bdad8354139593cecb7cbbe3de27d8c5f6017 (patch) | |
| tree | 82fada8c6425a9cd8194d0ac06b91981c7b5087a /release | |
| parent | 9b7b8464b9b09f4ca74e40624d3d6c8dffb0247e (diff) | |
| parent | 226ff0d4da13ac66991f1708251faa5dff3f7dea (diff) | |
svn merge -r40222:40344 ^/trunk/blender
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/rna_info.py | 6 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_curve.py | 3 |
2 files changed, 4 insertions, 5 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 diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index eb68311c8e2..861359fbed4 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -110,8 +110,7 @@ class DATA_PT_shape_curve(CurveButtonsPanel, Panel): col.label(text=_("Fill:")) sub = col.column() sub.active = (curve.dimensions == '2D' or (curve.bevel_object is None and curve.dimensions == '3D')) - sub.prop(curve, "use_fill_front") - sub.prop(curve, "use_fill_back") + sub.prop(curve, "fill_mode", text="") col.prop(curve, "use_fill_deform", text=_("Fill Deformed")) |