diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-19 13:52:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-19 13:52:11 +0400 |
| commit | fbdd33f62dd5fe1ec586e68a2dfb64d005f322bc (patch) | |
| tree | 08e2ae771a18c1e78ef86ddfc75abb1689476c7d /release | |
| parent | 1dad9bf0bcf0ed94d6542088f1e217f29540ec8c (diff) | |
py/ui edit: change InputKeyMapPanel to be a mix-in class only (not a subclass of Panel), it messes up re-registering panels.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref_keymap.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index bf396e98c79..cad5369f440 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -752,7 +752,7 @@ class USERPREF_PT_file(bpy.types.Panel): from bl_ui.space_userpref_keymap import InputKeyMapPanel -class USERPREF_PT_input(InputKeyMapPanel): +class USERPREF_PT_input(bpy.types.Panel, InputKeyMapPanel): bl_space_type = 'USER_PREFERENCES' bl_label = "Input" diff --git a/release/scripts/startup/bl_ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py index 378fe231091..982e19e6234 100644 --- a/release/scripts/startup/bl_ui/space_userpref_keymap.py +++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py @@ -138,7 +138,7 @@ class USERPREF_MT_keyconfigs(bpy.types.Menu): bpy.types.Menu.draw_preset(self, context) -class InputKeyMapPanel(bpy.types.Panel): +class InputKeyMapPanel: bl_space_type = 'USER_PREFERENCES' bl_label = "Input" bl_region_type = 'WINDOW' |