diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
| commit | 2d1a05874b46d31ee3598ec786a77b45512d99e1 (patch) | |
| tree | f0c453f231b52b5898911f77365d908145da8460 /release | |
| parent | 7be1cd733dfe064d1976b706610c39f97e536b90 (diff) | |
| parent | 399ad54204ad9c3bc9dbd15ec4840824d224dc0c (diff) | |
svn merge ^/trunk/blender -r44024:44076
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/blender_icons.png | bin | 218213 -> 219467 bytes | |||
| -rw-r--r-- | release/scripts/startup/bl_operators/presets.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_logic.py | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/release/datafiles/blender_icons.png b/release/datafiles/blender_icons.png Binary files differindex dc4e7652057..805b2836fc6 100644 --- a/release/datafiles/blender_icons.png +++ b/release/datafiles/blender_icons.png diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index f317295d2e5..1a17cd9f000 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -196,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): |
