Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-10-10 19:11:11 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-10-10 19:27:01 +0300
commit7dc2a5a2676ec6169a38b5e6654f46547d1080df (patch)
tree799b3a63adb6304d53effb30b2ae30c0401ce96c /release/scripts
parent4149ee9bf65fb62c6988248ea74d89ed8262e8db (diff)
Fix T57144: saving theme presets not working after recent changes.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_operators/presets.py7
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py2
2 files changed, 3 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index 59bcae2a789..9d64c02d1ca 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -242,8 +242,8 @@ class ExecutePreset(Operator):
self.report({'ERROR'}, "unknown filetype: %r" % ext)
return {'CANCELLED'}
- if hasattr(preset_class, "pre_cb"):
- preset_class.pre_cb(context)
+ if hasattr(preset_class, "reset_cb"):
+ preset_class.reset_cb(context)
# execute the preset using script.python_file_run
if ext == ".py":
@@ -571,9 +571,6 @@ class AddPresetInterfaceTheme(AddPresetBase, Operator):
preset_menu = "USERPREF_MT_interface_theme_presets"
preset_subdir = "interface_theme"
- def pre_cb(self, context):
- bpy.ops.ui.reset_default_theme()
-
class AddPresetKeyconfig(AddPresetBase, Operator):
"""Add or remove a Key-config Preset"""
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 21c2e32e932..d4cce81ea86 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -505,7 +505,7 @@ class USERPREF_MT_interface_theme_presets(Menu):
)
draw = Menu.draw_preset
- def pre_cb(context):
+ def reset_cb(context):
bpy.ops.ui.reset_default_theme()