From 43fbbc95bc6013fda73c70c2729f309b4194767a Mon Sep 17 00:00:00 2001 From: Simon Thommes Date: Wed, 1 Oct 2025 15:50:34 +0200 Subject: [PATCH] Modifiers: Add icons to remaining modifier assets in `Generate` category This adds new icons for the remaining two modifier Essentials assets bundled with Blender in the `Generate` category. (`Curve to Tube` and `Scatter on Surface`) Pull Request: https://projects.blender.org/blender/blender/pulls/147115 --- release/datafiles/icons_svg/mod_curve_to_tube.svg | 1 + release/datafiles/icons_svg/mod_scatter_on_surface.svg | 10 ++++++++++ scripts/startup/bl_ui/properties_data_modifier.py | 4 ++-- source/blender/editors/datafiles/CMakeLists.txt | 2 ++ source/blender/editors/include/UI_icons.hh | 2 ++ 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 release/datafiles/icons_svg/mod_curve_to_tube.svg create mode 100644 release/datafiles/icons_svg/mod_scatter_on_surface.svg diff --git a/release/datafiles/icons_svg/mod_curve_to_tube.svg b/release/datafiles/icons_svg/mod_curve_to_tube.svg new file mode 100644 index 00000000000..84d4d093b9d --- /dev/null +++ b/release/datafiles/icons_svg/mod_curve_to_tube.svg @@ -0,0 +1 @@ + diff --git a/release/datafiles/icons_svg/mod_scatter_on_surface.svg b/release/datafiles/icons_svg/mod_scatter_on_surface.svg new file mode 100644 index 00000000000..9605804da20 --- /dev/null +++ b/release/datafiles/icons_svg/mod_scatter_on_surface.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/scripts/startup/bl_ui/properties_data_modifier.py b/scripts/startup/bl_ui/properties_data_modifier.py index f99cc9633d0..cc36edcda55 100644 --- a/scripts/startup/bl_ui/properties_data_modifier.py +++ b/scripts/startup/bl_ui/properties_data_modifier.py @@ -155,7 +155,7 @@ class OBJECT_MT_modifier_add_generate(ModifierAddMenu, Menu): self.operator_modifier_add(layout, 'BOOLEAN') if ob_type in {'MESH', 'CURVE', 'FONT', 'SURFACE'}: self.operator_modifier_add(layout, 'BUILD') - self.operator_modifier_add_asset(layout, n_('Curve to Tube')) + self.operator_modifier_add_asset(layout, n_('Curve to Tube'), icon='MOD_CURVE_TO_TUBE') self.operator_modifier_add(layout, 'DECIMATE') self.operator_modifier_add(layout, 'EDGE_SPLIT') if ob_type == 'MESH': @@ -168,7 +168,7 @@ class OBJECT_MT_modifier_add_generate(ModifierAddMenu, Menu): self.operator_modifier_add(layout, 'MULTIRES') if ob_type in {'MESH', 'CURVE', 'FONT', 'SURFACE'}: self.operator_modifier_add(layout, 'REMESH') - self.operator_modifier_add_asset(layout, n_('Scatter on Surface')) + self.operator_modifier_add_asset(layout, n_('Scatter on Surface'), icon='MOD_SCATTER_ON_SURFACE') self.operator_modifier_add(layout, 'SCREW') if ob_type == 'MESH': self.operator_modifier_add(layout, 'SKIN') diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 8ad024f3ea4..3a6e9c40809 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -572,6 +572,7 @@ if(WITH_BLENDER) mod_cloth mod_color_balance mod_curve + mod_curve_to_tube mod_curves mod_dash mod_data_transfer @@ -603,6 +604,7 @@ if(WITH_BLENDER) mod_particle_instance mod_physics mod_remesh + mod_scatter_on_surface mod_screw mod_shrinkwrap mod_simpledeform diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index 4292f297e7a..b05ce1a94db 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -521,6 +521,7 @@ DEF_ICON_MODIFIER(MOD_BUILD) DEF_ICON_MODIFIER(MOD_CAST) DEF_ICON_MODIFIER(MOD_CLOTH) DEF_ICON_MODIFIER(MOD_CURVE) +DEF_ICON_MODIFIER(MOD_CURVE_TO_TUBE) DEF_ICON_MODIFIER(MOD_DASH) DEF_ICON_MODIFIER(MOD_DATA_TRANSFER) DEF_ICON_MODIFIER(MOD_DECIM) @@ -550,6 +551,7 @@ DEF_ICON_MODIFIER(MOD_PARTICLE_INSTANCE) DEF_ICON_MODIFIER(MOD_PARTICLES) DEF_ICON_MODIFIER(MOD_PHYSICS) DEF_ICON_MODIFIER(MOD_REMESH) +DEF_ICON_MODIFIER(MOD_SCATTER_ON_SURFACE) DEF_ICON_MODIFIER(MOD_SCREW) DEF_ICON_MODIFIER(MOD_SHRINKWRAP) DEF_ICON_MODIFIER(MOD_SIMPLEDEFORM)