From ab051e1f17905162942368a5b6fa3be1cd24d604 Mon Sep 17 00:00:00 2001 From: quackarooni Date: Sun, 10 Nov 2024 12:20:31 +0100 Subject: [PATCH 1/2] Fix: GPv3: "Lineart" and "Opacity" modifier don't follow alphabetical order The `Lineart` and `Opacity` modifier appear at the bottom of their respective menus instead of following alphabetical order. There doesn't seem to be any conceivable reason to do this, and it is inconsistent with how the modifiers were laid out in older Blender versions. Fixes the order of the modifiers. Pull Request: https://projects.blender.org/blender/blender/pulls/130080 --- scripts/startup/bl_ui/properties_data_modifier.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/startup/bl_ui/properties_data_modifier.py b/scripts/startup/bl_ui/properties_data_modifier.py index a9e33bd7b14..5990186ad57 100644 --- a/scripts/startup/bl_ui/properties_data_modifier.py +++ b/scripts/startup/bl_ui/properties_data_modifier.py @@ -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) From 1c8669f8c9c146d9fcd2e111f5308e9dc6ee0970 Mon Sep 17 00:00:00 2001 From: nutti Date: Sun, 10 Nov 2024 23:34:16 +1100 Subject: [PATCH 2/2] Fix: sphinx_doc_gen.py syntax error while generating PyDoc Ref !130085 --- doc/python_api/sphinx_doc_gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 45615492a4c..933bb397223 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -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: