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

UI: SVG Icons for Collection Colors

Browse Source 
A test of using multi-color SVG icons in place of the current "vector"
(custom drawn) style we are using now. These use separate colors for
the box body versus outline, shadow, handhold. Colored by the theme
colors.

Pull Request: https://projects.blender.org/blender/blender/pulls/126307
This commit is contained in:
Harley Acheson
2025-10-07 02:07:28 +02:00
committed by Harley Acheson
parent 8663f704a2
commit b11093306b
13 changed files with 35 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/datafiles/icons_svg/collection_color_01.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection_color_01" fill="#ccc" transform="matrix(1 0 0 1.00000000901 .461255 99.54043592837)"><path id="path1-0" d="m199.54534 100.46767-.0115 299.99108s1299.68488 2.63699 1299.94958-.0777l.047-299.95034z"/><path id="path1-4" d="m299.50799 500.42887.015 799.93003 1099.99644.081-.055-799.9343"/></g><g fill-opacity=".7"><path id="path1" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" stroke-width=".995635"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
release/datafiles/icons_svg/collection_color_02.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection_color_02" fill="#ccc" transform="matrix(1 0 0 1.00000000901 .461255 99.54043592837)"><path id="path1-0" d="m199.54534 100.46767-.0115 299.99108s1299.68488 2.63699 1299.94958-.0777l.047-299.95034z"/><path id="path1-4" d="m299.50799 500.42887.015 799.93003 1099.99644.081-.055-799.9343"/></g><g fill-opacity=".7"><path id="path1" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" stroke-width=".995635"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
release/datafiles/icons_svg/collection_color_03.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection_color_03" fill="#ccc" transform="matrix(1 0 0 1.00000000901 .461255 99.54043592837)"><path id="path1-0" d="m199.54534 100.46767-.0115 299.99108s1299.68488 2.63699 1299.94958-.0777l.047-299.95034z"/><path id="path1-4" d="m299.50799 500.42887.015 799.93003 1099.99644.081-.055-799.9343"/></g><g fill-opacity=".7"><path id="path1" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" stroke-width=".995635"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
release/datafiles/icons_svg/collection_color_04.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection_color_04" fill="#ccc" transform="matrix(1 0 0 1.00000000901 .461255 99.54043592837)"><path id="path1-0" d="m199.54534 100.46767-.0115 299.99108s1299.68488 2.63699 1299.94958-.0777l.047-299.95034z"/><path id="path1-4" d="m299.50799 500.42887.015 799.93003 1099.99644.081-.055-799.9343"/></g><g fill-opacity=".7"><path id="path1" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" stroke-width=".995635"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
release/datafiles/icons_svg/collection_color_05.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection_color_05" fill="#ccc" transform="matrix(1 0 0 1.00000000901 .461255 99.54043592837)"><path id="path1-0" d="m199.54534 100.46767-.0115 299.99108s1299.68488 2.63699 1299.94958-.0777l.047-299.95034z"/><path id="path1-4" d="m299.50799 500.42887.015 799.93003 1099.99644.081-.055-799.9343"/></g><g fill-opacity=".7"><path id="path1" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" stroke-width=".995635"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
release/datafiles/icons_svg/collection_color_06.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection_color_06" fill="#ccc" transform="matrix(1 0 0 1.00000000901 .461255 99.54043592837)"><path id="path1-0" d="m199.54534 100.46767-.0115 299.99108s1299.68488 2.63699 1299.94958-.0777l.047-299.95034z"/><path id="path1-4" d="m299.50799 500.42887.015 799.93003 1099.99644.081-.055-799.9343"/></g><g fill-opacity=".7"><path id="path1" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" stroke-width=".995635"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
release/datafiles/icons_svg/collection_color_07.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection_color_07" fill="#ccc" transform="matrix(1 0 0 1.00000000901 .461255 99.54043592837)"><path id="path1-0" d="m199.54534 100.46767-.0115 299.99108s1299.68488 2.63699 1299.94958-.0777l.047-299.95034z"/><path id="path1-4" d="m299.50799 500.42887.015 799.93003 1099.99644.081-.055-799.9343"/></g><g fill-opacity=".7"><path id="path1" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" stroke-width=".995635"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
release/datafiles/icons_svg/collection_color_08.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection_color_08" fill="#ccc" transform="matrix(1 0 0 1.00000000901 .461255 99.54043592837)"><path id="path1-0" d="m199.54534 100.46767-.0115 299.99108s1299.68488 2.63699 1299.94958-.0777l.047-299.95034z"/><path id="path1-4" d="m299.50799 500.42887.015 799.93003 1099.99644.081-.055-799.9343"/></g><g fill-opacity=".7"><path id="path1" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" stroke-width=".995635"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

2
release/datafiles/icons_svg/outliner_collection.svg
View File

@@ -1 +1 @@
<svg height="1500" viewBox="0 0 1600 1500" width="1600" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g fill="#fff"><path d="m1456 538v7.5c0 .27613.2239.49997.5.5h11c.2761-.00003.5-.22387.5-.5v-7.5zm5 1h2a1.0001 1.0001 0 1 1 0 2h-2a1.0001 1.0001 0 1 1 0-2zm-5.5-6c-.2761.00003-.5.22387-.5.5v3c0 .27613.2239.49997.5.5h13c.2761-.00003.5-.22387.5-.5v-3c0-.27613-.2239-.49997-.5-.5z" transform="matrix(100 0 0 100 -145400.005 -53200)"/></g></svg> <svg id="svg1" height="1600" viewBox="0 0 1700 1600" width="1700" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"><sodipodi:namedview pagecolor="#303030" showgrid="true"><inkscape:grid id="grid5" units="px" spacingx="100" spacingy="100" color="#4772b3" opacity="0.2" visible="true" /></sodipodi:namedview><g id="blender_collection"><path id="path1" d="m1499.5309 100.43027-1299.9863.03711-.01171 299.99218s1299.68651 2.63656 1299.95121-.07812zm-1200.0234 399.99804.01562 799.92969 1099.99608.082-.0547-799.93357z" fill="#fff" transform="translate(.461255 99.540436)"/></g><path id="path2" d="m175.6648 99.948542c-48.15785-.323156-75.54556 25.527328-75.54725 76.532298l-.014 423.30849s57.2301.18883 99.92707.23534l.0469 822.68913c.69231 47.4171 25.65156 76.9025 76.74481 77.2317h1147.55127c51.7456 0 76.0346-27.6411 75.7384-77.572l-.054-822.45446c43.7336-.1314 99.986-.18248 99.986-.18248v-424.07111c0-51.0049-25.7441-76.054072-73.9019-75.730906zm24.55583 100.301818h1299.80377v299.88603l-1299.96685-.10128zm99.81 399.85649 1099.96687-.0725-.2031 800.44125-1099.80377-.1993z" fill-opacity=".5" stroke-width="99.8344"/><path id="handhold" d="m700.40998 701.40838c-136.44824.30561-129.50035 200.27886 0 199.99996h299.03314c133.05938-.075 132.82888-199.92785 0-199.99996z" fill-opacity=".940455" stroke-width=".995635"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 752 B

After

Width:  |  Height:  |  Size: 1.4 KiB

8
source/blender/editors/datafiles/CMakeLists.txt
View File

@@ -245,6 +245,14 @@ if(WITH_BLENDER)
clipuv_dehlt clipuv_dehlt
clipuv_hlt clipuv_hlt
collapsemenu collapsemenu
collection_color_01
collection_color_02
collection_color_03
collection_color_04
collection_color_05
collection_color_06
collection_color_07
collection_color_08
collection_new collection_new
color color
color_blue color_blue

19
source/blender/editors/include/UI_icons.hh
View File

@@ -308,7 +308,15 @@ DEF_ICON(DECORATE_OVERRIDE)
DEF_ICON(DECORATE) DEF_ICON(DECORATE)
/* OUTLINER */ /* OUTLINER */
DEF_ICON_COLLECTION(OUTLINER_COLLECTION) DEF_ICON_COLOR(OUTLINER_COLLECTION)
DEF_ICON_COLOR(COLLECTION_COLOR_01)
DEF_ICON_COLOR(COLLECTION_COLOR_02)
DEF_ICON_COLOR(COLLECTION_COLOR_03)
DEF_ICON_COLOR(COLLECTION_COLOR_04)
DEF_ICON_COLOR(COLLECTION_COLOR_05)
DEF_ICON_COLOR(COLLECTION_COLOR_06)
DEF_ICON_COLOR(COLLECTION_COLOR_07)
DEF_ICON_COLOR(COLLECTION_COLOR_08)
DEF_ICON_OBJECT_DATA(CURVES_DATA) DEF_ICON_OBJECT_DATA(CURVES_DATA)
DEF_ICON_OBJECT_DATA(OUTLINER_DATA_ARMATURE) DEF_ICON_OBJECT_DATA(OUTLINER_DATA_ARMATURE)
DEF_ICON_OBJECT_DATA(OUTLINER_DATA_CAMERA) DEF_ICON_OBJECT_DATA(OUTLINER_DATA_CAMERA)
@@ -926,15 +934,6 @@ DEF_ICON_VECTOR(COLORSET_18_VEC)
DEF_ICON_VECTOR(COLORSET_19_VEC) DEF_ICON_VECTOR(COLORSET_19_VEC)
DEF_ICON_VECTOR(COLORSET_20_VEC) DEF_ICON_VECTOR(COLORSET_20_VEC)
DEF_ICON_VECTOR(COLLECTION_COLOR_01)
DEF_ICON_VECTOR(COLLECTION_COLOR_02)
DEF_ICON_VECTOR(COLLECTION_COLOR_03)
DEF_ICON_VECTOR(COLLECTION_COLOR_04)
DEF_ICON_VECTOR(COLLECTION_COLOR_05)
DEF_ICON_VECTOR(COLLECTION_COLOR_06)
DEF_ICON_VECTOR(COLLECTION_COLOR_07)
DEF_ICON_VECTOR(COLLECTION_COLOR_08)
DEF_ICON_VECTOR(STRIP_COLOR_01) DEF_ICON_VECTOR(STRIP_COLOR_01)
DEF_ICON_VECTOR(STRIP_COLOR_02) DEF_ICON_VECTOR(STRIP_COLOR_02)
DEF_ICON_VECTOR(STRIP_COLOR_03) DEF_ICON_VECTOR(STRIP_COLOR_03)

54
source/blender/editors/interface/interface_icons.cc
View File

@@ -477,43 +477,6 @@ DEF_ICON_VECTOR_COLORSET_DRAW_NTH(20, 19)
# undef DEF_ICON_VECTOR_COLORSET_DRAW_NTH # undef DEF_ICON_VECTOR_COLORSET_DRAW_NTH
static void vicon_collection_color_draw(
short color_tag, float x, float y, float w, float /*h*/, float /*alpha*/)
{
bTheme *btheme = UI_GetTheme();
const ThemeCollectionColor *collection_color = &btheme->collection_color[color_tag];
const float aspect = float(ICON_DEFAULT_WIDTH) / w;
UI_icon_draw_ex(x,
y,
ICON_OUTLINER_COLLECTION,
aspect,
1.0f,
0.0f,
collection_color->color,
btheme->tui.icon_border_intensity > 0.0f,
UI_NO_ICON_OVERLAY_TEXT);
}
# define DEF_ICON_COLLECTION_COLOR_DRAW(index, color) \
static void vicon_collection_color_draw_##index( \
float x, float y, float w, float h, float alpha, const uchar * /*mono_rgba[4]*/) \
{ \
vicon_collection_color_draw(color, x, y, w, h, alpha); \
}
DEF_ICON_COLLECTION_COLOR_DRAW(01, COLLECTION_COLOR_01);
DEF_ICON_COLLECTION_COLOR_DRAW(02, COLLECTION_COLOR_02);
DEF_ICON_COLLECTION_COLOR_DRAW(03, COLLECTION_COLOR_03);
DEF_ICON_COLLECTION_COLOR_DRAW(04, COLLECTION_COLOR_04);
DEF_ICON_COLLECTION_COLOR_DRAW(05, COLLECTION_COLOR_05);
DEF_ICON_COLLECTION_COLOR_DRAW(06, COLLECTION_COLOR_06);
DEF_ICON_COLLECTION_COLOR_DRAW(07, COLLECTION_COLOR_07);
DEF_ICON_COLLECTION_COLOR_DRAW(08, COLLECTION_COLOR_08);
# undef DEF_ICON_COLLECTION_COLOR_DRAW
static void vicon_strip_color_draw( static void vicon_strip_color_draw(
short color_tag, float x, float y, float w, float /*h*/, float /*alpha*/) short color_tag, float x, float y, float w, float /*h*/, float /*alpha*/)
{ {
@@ -996,15 +959,6 @@ static void init_internal_icons()
def_internal_vicon(ICON_COLORSET_19_VEC, vicon_colorset_draw_19); def_internal_vicon(ICON_COLORSET_19_VEC, vicon_colorset_draw_19);
def_internal_vicon(ICON_COLORSET_20_VEC, vicon_colorset_draw_20); def_internal_vicon(ICON_COLORSET_20_VEC, vicon_colorset_draw_20);
def_internal_vicon(ICON_COLLECTION_COLOR_01, vicon_collection_color_draw_01);
def_internal_vicon(ICON_COLLECTION_COLOR_02, vicon_collection_color_draw_02);
def_internal_vicon(ICON_COLLECTION_COLOR_03, vicon_collection_color_draw_03);
def_internal_vicon(ICON_COLLECTION_COLOR_04, vicon_collection_color_draw_04);
def_internal_vicon(ICON_COLLECTION_COLOR_05, vicon_collection_color_draw_05);
def_internal_vicon(ICON_COLLECTION_COLOR_06, vicon_collection_color_draw_06);
def_internal_vicon(ICON_COLLECTION_COLOR_07, vicon_collection_color_draw_07);
def_internal_vicon(ICON_COLLECTION_COLOR_08, vicon_collection_color_draw_08);
def_internal_vicon(ICON_STRIP_COLOR_01, vicon_strip_color_draw_01); def_internal_vicon(ICON_STRIP_COLOR_01, vicon_strip_color_draw_01);
def_internal_vicon(ICON_STRIP_COLOR_02, vicon_strip_color_draw_02); def_internal_vicon(ICON_STRIP_COLOR_02, vicon_strip_color_draw_02);
def_internal_vicon(ICON_STRIP_COLOR_03, vicon_strip_color_draw_03); def_internal_vicon(ICON_STRIP_COLOR_03, vicon_strip_color_draw_03);
@@ -1538,6 +1492,14 @@ static void svg_replace_color_attributes(std::string &svg,
{"blender_info", nullptr, TH_INFO}, {"blender_info", nullptr, TH_INFO},
{"blender_scene", nullptr, TH_ICON_SCENE}, {"blender_scene", nullptr, TH_ICON_SCENE},
{"blender_collection", nullptr, TH_ICON_COLLECTION}, {"blender_collection", nullptr, TH_ICON_COLLECTION},
{"blender_collection_color_01", btheme->collection_color[0].color},
{"blender_collection_color_02", btheme->collection_color[1].color},
{"blender_collection_color_03", btheme->collection_color[2].color},
{"blender_collection_color_04", btheme->collection_color[3].color},
{"blender_collection_color_05", btheme->collection_color[4].color},
{"blender_collection_color_06", btheme->collection_color[5].color},
{"blender_collection_color_07", btheme->collection_color[6].color},
{"blender_collection_color_08", btheme->collection_color[7].color},
{"blender_object", nullptr, TH_ICON_OBJECT}, {"blender_object", nullptr, TH_ICON_OBJECT},
{"blender_object_data", nullptr, TH_ICON_OBJECT_DATA}, {"blender_object_data", nullptr, TH_ICON_OBJECT_DATA},
{"blender_modifier", nullptr, TH_ICON_MODIFIER}, {"blender_modifier", nullptr, TH_ICON_MODIFIER},

2
source/blender/editors/space_outliner/outliner_draw.cc
View File

@@ -2986,7 +2986,7 @@ static bool tselem_draw_icon(uiBlock *block,
if (collection->color_tag != COLLECTION_COLOR_NONE) { if (collection->color_tag != COLLECTION_COLOR_NONE) {
UI_icon_draw_ex(x, UI_icon_draw_ex(x,
y, y,
data.icon, ICON_COLLECTION_COLOR_01 + collection->color_tag,
UI_INV_SCALE_FAC, UI_INV_SCALE_FAC,
alpha, alpha,
0.0f, 0.0f,