griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Bastien Montagne
2024-11-10 18:24:49 +01:00
parent e9252f206b 1c8669f8c9
commit 246b43e136
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/python_api/sphinx_doc_gen.py
View File

@@ -1658,7 +1658,7 @@ def pyrna2sphinx(basepath):
del key, descr
for func in struct.functions:
args_kw_only_index = next((i for i in i, prop in enumerate(func.args) if not prop.is_required), -1)
args_kw_only_index = next((i for i, prop in enumerate(func.args) if not prop.is_required), -1)
if args_kw_only_index == -1:
args_str = ", ".join(prop.get_arg_default(force=False) for prop in func.args)
else:

4
scripts/startup/bl_ui/properties_data_modifier.py
View File

@@ -165,12 +165,12 @@ class OBJECT_MT_modifier_add_generate(ModifierAddMenu, Menu):
self.operator_modifier_add(layout, 'GREASE_PENCIL_DASH')
self.operator_modifier_add(layout, 'GREASE_PENCIL_ENVELOPE')
self.operator_modifier_add(layout, 'GREASE_PENCIL_LENGTH')
self.operator_modifier_add(layout, 'LINEART')
self.operator_modifier_add(layout, 'GREASE_PENCIL_MIRROR')
self.operator_modifier_add(layout, 'GREASE_PENCIL_MULTIPLY')
self.operator_modifier_add(layout, 'GREASE_PENCIL_OUTLINE')
self.operator_modifier_add(layout, 'GREASE_PENCIL_SIMPLIFY')
self.operator_modifier_add(layout, 'GREASE_PENCIL_SUBDIV')
self.operator_modifier_add(layout, 'LINEART')
layout.template_modifier_asset_menu_items(catalog_path=self.bl_label)
@@ -262,8 +262,8 @@ class OBJECT_MT_modifier_add_color(ModifierAddMenu, Menu):
ob_type = context.object.type
if ob_type == 'GREASEPENCIL':
self.operator_modifier_add(layout, 'GREASE_PENCIL_COLOR')
self.operator_modifier_add(layout, 'GREASE_PENCIL_TINT')
self.operator_modifier_add(layout, 'GREASE_PENCIL_OPACITY')
self.operator_modifier_add(layout, 'GREASE_PENCIL_TINT')
layout.template_modifier_asset_menu_items(catalog_path=self.bl_label)