blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

LibOverride: Add a new 'virtual' non-editable override icon and use it in Outliner. 

Ref: {T95707}.
This commit is contained in:
Bastien Montagne 2022-03-29 17:26:13 +02:00
parent 5adcf6c85e
commit 9394d455af
Notes: blender-bot 2024-03-22 15:57:27 +01:00 
Referenced by issue #95707, Library Override - System override IDs
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/UI_icons.h
View File

@ -982,6 +982,7 @@ DEF_ICON_VECTOR(SEQUENCE_COLOR_08)
DEF_ICON_VECTOR(SEQUENCE_COLOR_09)
DEF_ICON_VECTOR(LIBRARY_DATA_INDIRECT)
DEF_ICON_VECTOR(LIBRARY_DATA_OVERRIDE_NONEDITABLE)
/* Events. */
DEF_ICON_COLOR(EVENT_A)

21
source/blender/editors/interface/interface_icons.c
View File

@ -476,6 +476,21 @@ static void vicon_strip_color_draw_library_data_indirect(
x, y, ICON_LIBRARY_DATA_DIRECT, aspect, ICON_INDIRECT_DATA_ALPHA * alpha, 0.0f, NULL, false);
}
static void vicon_strip_color_draw_library_data_override_noneditable(
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_OVERRIDE,
aspect,
ICON_INDIRECT_DATA_ALPHA * alpha * 0.75f,
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.
@ -987,6 +1002,8 @@ static void init_internal_icons(void)
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);
def_internal_vicon(ICON_LIBRARY_DATA_OVERRIDE_NONEDITABLE,
vicon_strip_color_draw_library_data_override_noneditable);
}
static void init_iconfile_list(struct ListBase *list)
@ -2192,6 +2209,10 @@ int UI_icon_from_library(const ID *id)
return ICON_LIBRARY_DATA_DIRECT;
}
if (ID_IS_OVERRIDE_LIBRARY(id)) {
if (!ID_IS_OVERRIDE_LIBRARY_REAL(id) ||
(id->override_library->flag & IDOVERRIDE_LIBRARY_FLAG_SYSTEM_DEFINED) != 0) {
return ICON_LIBRARY_DATA_OVERRIDE_NONEDITABLE;
}
return ICON_LIBRARY_DATA_OVERRIDE;
}
if (ID_IS_ASSET(id)) {