diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 01:23:52 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 01:23:52 +0300 |
| commit | 24bd098dbaf8d26511cb416badb8489d1fcfe00b (patch) | |
| tree | 53e8f3f468da28fc80550db57d62afb16c6bb569 /source/blender/editors/include/UI_interface.h | |
| parent | 32aebe8c55963d42a6b541e266e85cac25f96311 (diff) | |
| parent | d49dec896aaae5e2cdb5f2e2926f3bd010f4a0fe (diff) | |
Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023
Diffstat (limited to 'source/blender/editors/include/UI_interface.h')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 66b3d9fba6b..415356d1d71 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -1789,7 +1789,6 @@ void UI_but_drag_attach_image(uiBut *but, struct ImBuf *imb, float scale); void UI_but_drag_set_asset(uiBut *but, const struct AssetHandle *asset, const char *path, - struct AssetMetaData *metadata, int import_type, /* eFileAssetImportType */ int icon, struct ImBuf *imb, |