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
path: root/release/scripts/startup
diff options
context:
space:
mode:
Diffstat (limited to 'release/scripts/startup')
-rw-r--r--release/scripts/startup/bl_operators/mesh.py4
-rw-r--r--release/scripts/startup/bl_operators/presets.py4
-rw-r--r--release/scripts/startup/bl_operators/userpref.py29
-rw-r--r--release/scripts/startup/bl_operators/uvcalc_follow_active.py2
-rw-r--r--release/scripts/startup/bl_operators/wm.py10
-rw-r--r--release/scripts/startup/bl_ui/space_text.py4
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_common.py2
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py10
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py2
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py2
-rw-r--r--release/scripts/startup/nodeitems_builtins.py2
11 files changed, 41 insertions, 30 deletions
diff --git a/release/scripts/startup/bl_operators/mesh.py b/release/scripts/startup/bl_operators/mesh.py
index 5fca3e194d7..ddbfe7845b1 100644
--- a/release/scripts/startup/bl_operators/mesh.py
+++ b/release/scripts/startup/bl_operators/mesh.py
@@ -219,7 +219,7 @@ class MeshSelectNext(Operator):
if find_adjacent.select_next(bm, self.report):
bm.select_flush_mode()
- bmesh.update_edit_mesh(me, False)
+ bmesh.update_edit_mesh(me, loop_triangles=False)
return {'FINISHED'}
@@ -244,7 +244,7 @@ class MeshSelectPrev(Operator):
if find_adjacent.select_prev(bm, self.report):
bm.select_flush_mode()
- bmesh.update_edit_mesh(me, False)
+ bmesh.update_edit_mesh(me, loop_triangles=False)
return {'FINISHED'}
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index cedbe542287..3189f3b3376 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -114,9 +114,7 @@ class AddPresetBase:
filename = self.as_filename(name)
target_path = os.path.join("presets", self.preset_subdir)
- target_path = bpy.utils.user_resource('SCRIPTS',
- target_path,
- create=True)
+ target_path = bpy.utils.user_resource('SCRIPTS', path=target_path, create=True)
if not target_path:
self.report({'WARNING'}, "Failed to create presets path")
diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py
index dd84dfa2df8..623bf583a74 100644
--- a/release/scripts/startup/bl_operators/userpref.py
+++ b/release/scripts/startup/bl_operators/userpref.py
@@ -90,7 +90,7 @@ class PREFERENCES_OT_copy_prev(Operator):
@classmethod
def _old_version_path(cls, version):
- return bpy.utils.resource_path('USER', version[0], version[1])
+ return bpy.utils.resource_path('USER', major=version[0], minor=version[1])
@classmethod
def previous_version(cls):
@@ -226,7 +226,11 @@ class PREFERENCES_OT_keyconfig_import(Operator):
config_name = basename(self.filepath)
- path = bpy.utils.user_resource('SCRIPTS', os.path.join("presets", "keyconfig"), create=True)
+ path = bpy.utils.user_resource(
+ 'SCRIPTS',
+ path=os.path.join("presets", "keyconfig"),
+ create=True,
+ )
path = os.path.join(path, config_name)
try:
@@ -529,7 +533,11 @@ class PREFERENCES_OT_theme_install(Operator):
xmlfile = self.filepath
- path_themes = bpy.utils.user_resource('SCRIPTS', "presets/interface_theme", create=True)
+ path_themes = bpy.utils.user_resource(
+ 'SCRIPTS',
+ path=os.path.join("presets", "interface_theme"),
+ create=True,
+ )
if not path_themes:
self.report({'ERROR'}, "Failed to get themes path")
@@ -622,8 +630,8 @@ class PREFERENCES_OT_addon_install(Operator):
pyfile = self.filepath
if self.target == 'DEFAULT':
- # don't use bpy.utils.script_paths("addons") because we may not be able to write to it.
- path_addons = bpy.utils.user_resource('SCRIPTS', "addons", create=True)
+ # Don't use `bpy.utils.script_paths(path="addons")` because we may not be able to write to it.
+ path_addons = bpy.utils.user_resource('SCRIPTS', path="addons", create=True)
else:
path_addons = context.preferences.filepaths.script_directory
if path_addons:
@@ -882,7 +890,8 @@ class PREFERENCES_OT_app_template_install(Operator):
filepath = self.filepath
path_app_templates = bpy.utils.user_resource(
- 'SCRIPTS', os.path.join("startup", "bl_app_templates_user"),
+ 'SCRIPTS',
+ path=os.path.join("startup", "bl_app_templates_user"),
create=True,
)
@@ -988,7 +997,7 @@ class PREFERENCES_OT_studiolight_install(Operator):
prefs = context.preferences
path_studiolights = os.path.join("studiolights", self.type.lower())
- path_studiolights = bpy.utils.user_resource('DATAFILES', path_studiolights, create=True)
+ path_studiolights = bpy.utils.user_resource('DATAFILES', path=path_studiolights, create=True)
if not path_studiolights:
self.report({'ERROR'}, "Failed to create Studio Light path")
return {'CANCELLED'}
@@ -1034,7 +1043,11 @@ class PREFERENCES_OT_studiolight_new(Operator):
wm = context.window_manager
filename = bpy.path.ensure_ext(self.filename, ".sl")
- path_studiolights = bpy.utils.user_resource('DATAFILES', os.path.join("studiolights", "studio"), create=True)
+ path_studiolights = bpy.utils.user_resource(
+ 'DATAFILES',
+ path=os.path.join("studiolights", "studio"),
+ create=True,
+ )
if not path_studiolights:
self.report({'ERROR'}, "Failed to get Studio Light path")
return {'CANCELLED'}
diff --git a/release/scripts/startup/bl_operators/uvcalc_follow_active.py b/release/scripts/startup/bl_operators/uvcalc_follow_active.py
index 1b801f77e07..90131109e24 100644
--- a/release/scripts/startup/bl_operators/uvcalc_follow_active.py
+++ b/release/scripts/startup/bl_operators/uvcalc_follow_active.py
@@ -223,7 +223,7 @@ def extend(obj, EXTEND_MODE):
for f_triple in walk_face(f_act):
apply_uv(*f_triple)
- bmesh.update_edit_mesh(me, False)
+ bmesh.update_edit_mesh(me, loop_triangles=False)
return STATUS_OK
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 35826cea860..2cc7b828c11 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1100,7 +1100,7 @@ class WM_OT_path_open(Operator):
return {'FINISHED'}
-def _wm_doc_get_id(doc_id, do_url=True, url_prefix="", report=None):
+def _wm_doc_get_id(doc_id, *, do_url=True, url_prefix="", report=None):
def operator_exists_pair(a, b):
# Not fast, this is only for docs.
@@ -1190,7 +1190,7 @@ class WM_OT_doc_view_manual(Operator):
doc_id: doc_id
@staticmethod
- def _find_reference(rna_id, url_mapping, verbose=True):
+ def _find_reference(rna_id, url_mapping, *, verbose=True):
if verbose:
print("online manual check for: '%s'... " % rna_id)
from fnmatch import fnmatchcase
@@ -1526,7 +1526,7 @@ class WM_OT_properties_edit(Operator):
self.default = ""
# setup defaults
- prop_ui = rna_idprop_ui_prop_get(item, prop, False) # don't create
+ prop_ui = rna_idprop_ui_prop_get(item, prop, create=False)
if prop_ui:
self.min = prop_ui.get("min", -1000000000)
self.max = prop_ui.get("max", 1000000000)
@@ -1910,7 +1910,7 @@ class WM_OT_toolbar(Operator):
return context.space_data is not None
@staticmethod
- def keymap_from_toolbar(context, space_type, use_fallback_keys=True, use_reset=True):
+ def keymap_from_toolbar(context, space_type, *, use_fallback_keys=True, use_reset=True):
from bl_ui.space_toolsystem_common import ToolSelectPanelHelper
from bl_keymap_utils import keymap_from_toolbar
@@ -2211,7 +2211,7 @@ class WM_OT_batch_rename(Operator):
actions: CollectionProperty(type=BatchRenameAction)
@staticmethod
- def _data_from_context(context, data_type, only_selected, check_context=False):
+ def _data_from_context(context, data_type, only_selected, *, check_context=False):
mode = context.mode
scene = context.scene
diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py
index c937882bd6e..93ab12e8462 100644
--- a/release/scripts/startup/bl_ui/space_text.py
+++ b/release/scripts/startup/bl_ui/space_text.py
@@ -284,7 +284,7 @@ class TEXT_MT_templates_py(Menu):
def draw(self, _context):
self.path_menu(
- bpy.utils.script_paths("templates_py"),
+ bpy.utils.script_paths(subdir="templates_py"),
"text.open",
props_default={"internal": True},
filter_ext=lambda ext: (ext.lower() == ".py")
@@ -296,7 +296,7 @@ class TEXT_MT_templates_osl(Menu):
def draw(self, _context):
self.path_menu(
- bpy.utils.script_paths("templates_osl"),
+ bpy.utils.script_paths(subdir="templates_osl"),
"text.open",
props_default={"internal": True},
filter_ext=lambda ext: (ext.lower() == ".osl")
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 12ec863327c..cde430c1e6f 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -218,7 +218,7 @@ class ToolSelectPanelHelper:
assert(type(icon_name) is str)
icon_value = _icon_cache.get(icon_name)
if icon_value is None:
- dirname = bpy.utils.system_resource('DATAFILES', "icons")
+ dirname = bpy.utils.system_resource('DATAFILES', path="icons")
filename = os.path.join(dirname, icon_name + ".dat")
try:
icon_value = bpy.app.icons.new_triangles_from_file(filename)
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index ce1c401b14b..c55f637f8b2 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -434,7 +434,7 @@ class _defs_view3d_select:
from gpu_extras.presets import draw_circle_2d
props = tool.operator_properties("view3d.select_circle")
radius = props.radius
- draw_circle_2d(xy, (1.0,) * 4, radius, 32)
+ draw_circle_2d(xy, (1.0,) * 4, radius, segments=32)
return dict(
idname="builtin.select_circle",
@@ -1813,7 +1813,7 @@ class _defs_image_uv_select:
from gpu_extras.presets import draw_circle_2d
props = tool.operator_properties("uv.select_circle")
radius = props.radius
- draw_circle_2d(xy, (1.0,) * 4, radius, 32)
+ draw_circle_2d(xy, (1.0,) * 4, radius, segments=32)
return dict(
idname="builtin.select_circle",
@@ -1858,7 +1858,7 @@ class _defs_image_uv_sculpt:
if brush is None:
return
radius = brush.size
- draw_circle_2d(xy, (1.0,) * 4, radius, 32)
+ draw_circle_2d(xy, (1.0,) * 4, radius, segments=32)
return generate_from_enum_ex(
context,
@@ -2150,7 +2150,7 @@ class _defs_gpencil_edit:
from gpu_extras.presets import draw_circle_2d
props = tool.operator_properties("gpencil.select_circle")
radius = props.radius
- draw_circle_2d(xy, (1.0,) * 4, radius, 32)
+ draw_circle_2d(xy, (1.0,) * 4, radius, segments=32)
return dict(
idname="builtin.select_circle",
@@ -2372,7 +2372,7 @@ class _defs_node_select:
from gpu_extras.presets import draw_circle_2d
props = tool.operator_properties("node.select_circle")
radius = props.radius
- draw_circle_2d(xy, (1.0,) * 4, radius, 32)
+ draw_circle_2d(xy, (1.0,) * 4, radius, segments=32)
return dict(
idname="builtin.select_circle",
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index d85fe16d654..26ad22d3ac2 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1815,7 +1815,7 @@ class USERPREF_PT_addons(AddOnPanel, Panel):
addon_user_dirs = tuple(
p for p in (
os.path.join(prefs.filepaths.script_directory, "addons"),
- bpy.utils.user_resource('SCRIPTS', "addons"),
+ bpy.utils.user_resource('SCRIPTS', path="addons"),
)
if p
)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index df520b38eb0..5f47aa90026 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -7002,7 +7002,7 @@ class VIEW3D_PT_context_properties(Panel):
if member:
# Draw with no edit button
- rna_prop_ui.draw(self.layout, context, member, object, False)
+ rna_prop_ui.draw(self.layout, context, member, object, use_edit=False)
# Grease Pencil Object - Multiframe falloff tools
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index e7b93dcc5ea..cf125075b3b 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -34,7 +34,7 @@ class SortedNodeCategory(NodeCategory):
if isinstance(items, list):
items = sorted(items, key=lambda item: item.label.lower())
- super().__init__(identifier, name, description, items)
+ super().__init__(identifier, name, description=description, items=items)
class CompositorNodeCategory(SortedNodeCategory):
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 18:55:36 +0300