bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Harley Acheson 2024-06-07 11:21:30 -07:00
commit 07652497a1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/startup/bl_operators/presets.py
View File

@ -600,6 +600,7 @@ class RemovePresetInterfaceTheme(AddPresetBase, Operator):
from bpy.utils import is_path_builtin from bpy.utils import is_path_builtin
preset_menu_class = getattr(bpy.types, cls.preset_menu) preset_menu_class = getattr(bpy.types, cls.preset_menu)
name = preset_menu_class.bl_label name = preset_menu_class.bl_label
name = bpy.path.clean_name(name)
filepath = bpy.utils.preset_find(name, cls.preset_subdir, ext=".xml") filepath = bpy.utils.preset_find(name, cls.preset_subdir, ext=".xml")
if not bool(filepath) or is_path_builtin(filepath): if not bool(filepath) or is_path_builtin(filepath):
cls.poll_message_set("Built-in themes cannot be removed") cls.poll_message_set("Built-in themes cannot be removed")
@ -633,6 +634,7 @@ class SavePresetInterfaceTheme(AddPresetBase, Operator):
preset_menu_class = getattr(bpy.types, cls.preset_menu) preset_menu_class = getattr(bpy.types, cls.preset_menu)
name = preset_menu_class.bl_label name = preset_menu_class.bl_label
name = bpy.path.clean_name(name)
filepath = bpy.utils.preset_find(name, cls.preset_subdir, ext=".xml") filepath = bpy.utils.preset_find(name, cls.preset_subdir, ext=".xml")
if (not filepath) or is_path_builtin(filepath): if (not filepath) or is_path_builtin(filepath):
cls.poll_message_set("Built-in themes cannot be overwritten") cls.poll_message_set("Built-in themes cannot be overwritten")
@ -644,6 +646,7 @@ class SavePresetInterfaceTheme(AddPresetBase, Operator):
import rna_xml import rna_xml
preset_menu_class = getattr(bpy.types, self.preset_menu) preset_menu_class = getattr(bpy.types, self.preset_menu)
name = preset_menu_class.bl_label name = preset_menu_class.bl_label
name = bpy.path.clean_name(name)
filepath = bpy.utils.preset_find(name, self.preset_subdir, ext=".xml") filepath = bpy.utils.preset_find(name, self.preset_subdir, ext=".xml")
if not bool(filepath) or is_path_builtin(filepath): if not bool(filepath) or is_path_builtin(filepath):
self.report({'ERROR'}, "Built-in themes cannot be overwritten") self.report({'ERROR'}, "Built-in themes cannot be overwritten")