[Bf-blender-cvs] [368d7944073] blender-v3.0-release: Cleanup: Remove `SMALL_TRI_RIGHT_VEC` icon

Pablo Vazquez noreply at git.blender.org
Tue Nov 9 16:10:08 CET 2021


Commit: 368d7944073ed022047ec4ff48eab7c272d5e750
Author: Pablo Vazquez
Date:   Tue Nov 9 16:09:53 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB368d7944073ed022047ec4ff48eab7c272d5e750

Cleanup: Remove `SMALL_TRI_RIGHT_VEC` icon

Since the recent change to context paths to use the arrow icon instead of the triangle (D13106),
the `SMALL_TRI_RIGHT_VEC`is no longer used. This patch removes the icon and all references.

- Replace `SMALL_TRI_RIGHT_VEC` with `RIGHTARROW` in Freestyle UI
- Remove references to `SMALL_TRI_RIGHT_VEC` and `ICON_SMALL_TRI_RIGHT_VEC`.

Fix for built-in add-ons has been done in rBAcc2f71bfe9b0/rBAa84028f8a89a.

This will be added to the list of breaking changes [[ https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Python_API#Breaking_Changes | in the Wiki ]].

Reviewed By: Severin

Differential Revision: https://developer.blender.org/D13130

===================================================================

M	release/scripts/startup/bl_ui/properties_freestyle.py
M	source/blender/editors/include/UI_icons.h
M	source/blender/editors/include/UI_resources.h

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py
index 4519390f953..802812020b7 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -526,7 +526,7 @@ class VIEWLAYER_PT_freestyle_linestyle_strokes(ViewLayerFreestyleLineStyle, Pane
         row = layout.row(align=True)
         row.alignment = 'LEFT'
         row.label(text=lineset.name, icon='LINE_DATA')
-        row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
+        row.label(text="", icon='RIGHTARROW')
         row.label(text=linestyle.name)
 
         col = layout.column(align=True)
@@ -830,7 +830,7 @@ class VIEWLAYER_PT_freestyle_linestyle_color(ViewLayerFreestyleLineStyle, Panel)
         row = layout.row(align=True)
         row.alignment = 'LEFT'
         row.label(text=lineset.name, icon='LINE_DATA')
-        row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
+        row.label(text="", icon='RIGHTARROW')
         row.label(text=linestyle.name)
 
         col = layout.column()
@@ -922,7 +922,7 @@ class VIEWLAYER_PT_freestyle_linestyle_alpha(ViewLayerFreestyleLineStyle, Panel)
         row = layout.row(align=True)
         row.alignment = 'LEFT'
         row.label(text=lineset.name, icon='LINE_DATA')
-        row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
+        row.label(text="", icon='RIGHTARROW')
         row.label(text=linestyle.name)
 
         col = layout.column()
@@ -1036,7 +1036,7 @@ class VIEWLAYER_PT_freestyle_linestyle_thickness(ViewLayerFreestyleLineStyle, Pa
         row = layout.row(align=True)
         row.alignment = 'LEFT'
         row.label(text=lineset.name, icon='LINE_DATA')
-        row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
+        row.label(text="", icon='RIGHTARROW')
         row.label(text=linestyle.name)
 
         col = layout.column()
@@ -1182,7 +1182,7 @@ class VIEWLAYER_PT_freestyle_linestyle_geometry(ViewLayerFreestyleLineStyle, Pan
         row = layout.row(align=True)
         row.alignment = 'LEFT'
         row.label(text=lineset.name, icon='LINE_DATA')
-        row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
+        row.label(text="", icon='RIGHTARROW')
         row.label(text=linestyle.name)
 
         col = layout.column()
@@ -1215,7 +1215,7 @@ class VIEWLAYER_PT_freestyle_linestyle_texture(ViewLayerFreestyleLineStyle, Pane
         row = layout.row(align=True)
         row.alignment = 'LEFT'
         row.label(text=lineset.name, icon='LINE_DATA')
-        row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
+        row.label(text="", icon='RIGHTARROW')
         row.label(text=linestyle.name)
 
         layout.prop(linestyle, "use_nodes")
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 8a7df5b54ff..c3c296f89ca 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -944,9 +944,7 @@ DEF_ICON_COLOR(GPBRUSH_ERASE_SOFT)
 DEF_ICON_COLOR(GPBRUSH_ERASE_HARD)
 DEF_ICON_COLOR(GPBRUSH_ERASE_STROKE)
 
-/* Vector Icons */
-DEF_ICON_VECTOR(SMALL_TRI_RIGHT_VEC)
-
+/* Vector icons. */
 DEF_ICON_VECTOR(KEYTYPE_KEYFRAME_VEC)
 DEF_ICON_VECTOR(KEYTYPE_BREAKDOWN_VEC)
 DEF_ICON_VECTOR(KEYTYPE_EXTREME_VEC)
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index c3a00bedaf8..61da496d344 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -39,10 +39,6 @@ typedef enum {
 
 #define BIFICONID_FIRST (ICON_NONE)
 
-/* Removed icon no longer used, defined so that add-ons don't have to be \
- * updated. */
-#define ICON_SMALL_TRI_RIGHT_VEC (ICON_RIGHTARROW)
-
 /* use to denote intentionally unset theme color */
 #define TH_UNDEFINED -1



More information about the Bf-blender-cvs mailing list