Icons: Programmatically create indirect library icon, remove from SVG
The indirect library data icon was just a grayed out version of the regular one. This graying out is now done in code, so the icon can be removed from the SVG. Note that the icon is still defined as `ICON_LIBRARY_DATA_INDIRECT` (or `LIBRARY_DATA_INDIRECT` in BPY).
This commit is contained in:
parent
62c73db734
commit
4def6e8072
|
@ -12431,11 +12431,6 @@
|
|||
id="path24010-2"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
|
||||
d="m 310.57031,473.01758 c -0.79787,-0.038 -1.57177,0.27684 -2.16015,0.86523 l -1.48633,1.48828 c -0.61577,0.57533 -0.93433,1.35407 -0.89258,2.1543 a 0.50005,0.50005 0 1 0 0.99805,-0.0508 c -0.0269,-0.51495 0.15566,-0.98016 0.57617,-1.37305 a 0.50005,0.50005 0 0 0 0.0117,-0.0117 l 1.5,-1.5 c 0.41161,-0.41161 0.88966,-0.59872 1.40429,-0.57422 0.51464,0.0245 1.08439,0.26993 1.63868,0.82422 0.55479,0.5548 0.80954,1.13546 0.83789,1.65235 0.0283,0.51688 -0.15241,0.9848 -0.57422,1.3789 a 0.50005,0.50005 0 0 0 -0.0137,0.0117 l -1.5,1.5 c -0.41213,0.41213 -0.87694,0.60352 -1.39649,0.60352 a 0.50005,0.50005 0 1 0 0,1 c 0.78067,0 1.52491,-0.31788 2.10352,-0.89649 l 1.48828,-1.48828 c 0.61768,-0.57711 0.9366,-1.36125 0.89258,-2.16406 -0.044,-0.80281 -0.43566,-1.60948 -1.13086,-2.30469 -0.69571,-0.69571 -1.49901,-1.07724 -2.29688,-1.11523 z m -1.08008,3.97851 a 0.50005,0.50005 0 0 0 -0.34375,0.15039 l -5,5 a 0.50005,0.50005 0 1 0 0.70704,0.70704 l 5,-5 a 0.50005,0.50005 0 0 0 -0.36329,-0.85743 z m -4.92968,2.02149 c -0.80753,-0.0482 -1.5954,0.26944 -2.17578,0.89062 l -1.48829,1.48828 c -0.58838,0.58839 -0.90322,1.36034 -0.86523,2.15821 0.038,0.79787 0.41952,1.60311 1.11523,2.29883 0.69521,0.6952 1.50384,1.08487 2.30664,1.1289 0.80281,0.044 1.585,-0.27294 2.16211,-0.89062 l 1.48829,-1.48828 C 307.68213,484.0249 308,483.28067 308,482.5 a 0.50005,0.50005 0 1 0 -1,0 c 0,0.51955 -0.19139,0.98436 -0.60352,1.39648 l -1.5,1.5 a 0.50005,0.50005 0 0 0 -0.0117,0.0117 c -0.39411,0.42182 -0.86007,0.60452 -1.37696,0.57618 -0.51688,-0.0283 -1.0995,-0.2831 -1.65429,-0.8379 -0.55429,-0.55428 -0.79776,-1.12404 -0.82227,-1.63867 -0.0245,-0.51463 0.16065,-0.99268 0.57227,-1.40429 l 1.5,-1.5 a 0.50005,0.50005 0 0 0 0.0117,-0.0117 c 0.39634,-0.4242 0.86629,-0.60725 1.38672,-0.57618 a 0.50005,0.50005 0 1 0 0.0586,-0.99804 z"
|
||||
id="path23281"
|
||||
inkscape:connector-curvature="0" />
|
||||
<g
|
||||
style="display:inline;fill:#ffffff;enable-background:new"
|
||||
id="g23341"
|
||||
|
|
Before Width: | Height: | Size: 2.5 MiB After Width: | Height: | Size: 2.5 MiB |
Binary file not shown.
Binary file not shown.
|
@ -191,7 +191,6 @@ set(ICON_NAMES
|
|||
library_data_broken
|
||||
boids
|
||||
strands
|
||||
library_data_indirect
|
||||
greasepencil
|
||||
line_data
|
||||
library_data_override
|
||||
|
|
|
@ -246,7 +246,7 @@ DEF_ICON(RENDER_STILL)
|
|||
DEF_ICON(LIBRARY_DATA_BROKEN)
|
||||
DEF_ICON(BOIDS)
|
||||
DEF_ICON(STRANDS)
|
||||
DEF_ICON(LIBRARY_DATA_INDIRECT)
|
||||
DEF_ICON_BLANK(263)
|
||||
DEF_ICON(GREASEPENCIL)
|
||||
DEF_ICON_SHADING(LINE_DATA)
|
||||
DEF_ICON(LIBRARY_DATA_OVERRIDE)
|
||||
|
@ -981,6 +981,8 @@ DEF_ICON_VECTOR(SEQUENCE_COLOR_07)
|
|||
DEF_ICON_VECTOR(SEQUENCE_COLOR_08)
|
||||
DEF_ICON_VECTOR(SEQUENCE_COLOR_09)
|
||||
|
||||
DEF_ICON_VECTOR(LIBRARY_DATA_INDIRECT)
|
||||
|
||||
/* Events. */
|
||||
DEF_ICON_COLOR(EVENT_A)
|
||||
DEF_ICON_COLOR(EVENT_B)
|
||||
|
|
|
@ -465,6 +465,17 @@ DEF_ICON_STRIP_COLOR_DRAW(09, SEQUENCE_COLOR_09);
|
|||
|
||||
# undef DEF_ICON_STRIP_COLOR_DRAW
|
||||
|
||||
# define ICON_INDIRECT_DATA_ALPHA 0.6f
|
||||
|
||||
static void vicon_strip_color_draw_library_data_indirect(
|
||||
int x, int y, int w, int UNUSED(h), float alpha)
|
||||
{
|
||||
const float aspect = (float)ICON_DEFAULT_WIDTH / (float)w;
|
||||
|
||||
UI_icon_draw_ex(
|
||||
x, y, ICON_LIBRARY_DATA_DIRECT, aspect, ICON_INDIRECT_DATA_ALPHA * alpha, 0.0f, NULL, false);
|
||||
}
|
||||
|
||||
/* Dynamically render icon instead of rendering a plain color to a texture/buffer
|
||||
* This is not strictly a "vicon", as it needs access to icon->obj to get the color info,
|
||||
* but it works in a very similar way.
|
||||
|
@ -974,6 +985,8 @@ static void init_internal_icons(void)
|
|||
def_internal_vicon(ICON_SEQUENCE_COLOR_07, vicon_strip_color_draw_07);
|
||||
def_internal_vicon(ICON_SEQUENCE_COLOR_08, vicon_strip_color_draw_08);
|
||||
def_internal_vicon(ICON_SEQUENCE_COLOR_09, vicon_strip_color_draw_09);
|
||||
|
||||
def_internal_vicon(ICON_LIBRARY_DATA_INDIRECT, vicon_strip_color_draw_library_data_indirect);
|
||||
}
|
||||
|
||||
static void init_iconfile_list(struct ListBase *list)
|
||||
|
|
Loading…
Reference in New Issue