From b6e5b02ede1bda55e3940cddb949aec38f3733f9 Mon Sep 17 00:00:00 2001 From: YimingWu Date: Wed, 24 Jan 2024 21:19:18 +0800 Subject: [PATCH] Cleanup: GPv3: Use consistent modifier RNA names "GREASEPENCIL_" changed to "GREASE_PENCIL_". --- scripts/startup/bl_ui/properties_data_modifier.py | 4 ++-- source/blender/makesrna/intern/rna_modifier.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/startup/bl_ui/properties_data_modifier.py b/scripts/startup/bl_ui/properties_data_modifier.py index 29f1c90c0e3..0bbd7d0854c 100644 --- a/scripts/startup/bl_ui/properties_data_modifier.py +++ b/scripts/startup/bl_ui/properties_data_modifier.py @@ -150,7 +150,7 @@ class OBJECT_MT_modifier_add_generate(ModifierAddMenu, Menu): if ob_type == 'MESH': self.operator_modifier_add(layout, 'WIREFRAME') if ob_type == 'GREASEPENCIL': - self.operator_modifier_add(layout, 'GREASEPENCIL_SUBDIV') + self.operator_modifier_add(layout, 'GREASE_PENCIL_SUBDIV') layout.template_modifier_asset_menu_items(catalog_path=self.bl_label) @@ -188,7 +188,7 @@ class OBJECT_MT_modifier_add_deform(ModifierAddMenu, Menu): if ob_type == 'VOLUME': self.operator_modifier_add(layout, 'VOLUME_DISPLACE') if ob_type == 'GREASEPENCIL': - self.operator_modifier_add(layout, 'GREASEPENCIL_SMOOTH') + self.operator_modifier_add(layout, 'GREASE_PENCIL_SMOOTH') layout.template_modifier_asset_menu_items(catalog_path=self.bl_label) diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc index ea88924c422..917815b0861 100644 --- a/source/blender/makesrna/intern/rna_modifier.cc +++ b/source/blender/makesrna/intern/rna_modifier.cc @@ -212,7 +212,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { "Wireframe", "Convert faces into thickened edges"}, {eModifierType_GreasePencilSubdiv, - "GREASEPENCIL_SUBDIV", + "GREASE_PENCIL_SUBDIV", ICON_MOD_SUBSURF, "Subdivide strokes", "Grease Pencil subdivide modifier"}, @@ -297,7 +297,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { "Volume Displace", "Deform volume based on noise or other vector fields"}, /* TODO: Use correct icon. */ {eModifierType_GreasePencilSmooth, - "GREASEPENCIL_SMOOTH", + "GREASE_PENCIL_SMOOTH", ICON_SMOOTHCURVE, "Smooth", "Smooth grease pencil strokes"},