diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-12 23:00:13 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-12 23:00:13 +0400 |
| commit | bcf4491304eeb37dd9f2624c3de86726daddcebd (patch) | |
| tree | b07669c75ad9de647df1f787f7c234d49019815b /release | |
| parent | 9e8c17206f0f36bbabea8bb85de3253b81801932 (diff) | |
| parent | 875f616ab8c0856bef287d1041141ee2f4d986aa (diff) | |
Merging r44003 through r44069 from trunk into soc-2011-tomato
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/presets.py | 5 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_logic.py | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 946543cc864..1a17cd9f000 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -35,10 +35,11 @@ class AddPresetBase(): name="Name", description="Name of the preset, used to make the path name", maxlen=64, + options={'SKIP_SAVE'}, ) remove_active = bpy.props.BoolProperty( default=False, - options={'HIDDEN'}, + options={'HIDDEN', 'SKIP_SAVE'}, ) @staticmethod @@ -195,7 +196,7 @@ class ExecutePreset(Operator): preset_class.preset_xml_map) else: self.report({'ERROR'}, "unknown filetype: %r" % ext) - return {'CANCELLED '} + return {'CANCELLED'} return {'FINISHED'} diff --git a/release/scripts/startup/bl_ui/space_logic.py b/release/scripts/startup/bl_ui/space_logic.py index 1e68b41c645..846169b3339 100644 --- a/release/scripts/startup/bl_ui/space_logic.py +++ b/release/scripts/startup/bl_ui/space_logic.py @@ -57,7 +57,8 @@ class LOGIC_PT_properties(Panel): props.name = 'Text' props.type = 'STRING' - layout.operator("object.game_property_new", text="Add Game Property", icon='ZOOMIN') + props = layout.operator("object.game_property_new", text="Add Game Property", icon='ZOOMIN') + props.name = '' for i, prop in enumerate(game.properties): |