diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-03 21:36:49 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-03 21:44:04 +0300 |
commit | 0a3e73a91fb06ca340e4de70a3ddd1ac037e9e33 (patch) | |
tree | 0d8c276cbcd0da3d27f09783ba5d849ff1623f90 /source/blender/windowmanager/WM_api.h | |
parent | 466cc3fbe406cb81c6ca48e29b74e5d6d59e18ba (diff) |
Fix T65899, T66314, T61808: various issues appending workspaces
This fixes crashes, wrong names and inability to append workspaces in
edit mode. We now bypass the append operator so we can easily return
a datablock pointer and work in any mode.
Diffstat (limited to 'source/blender/windowmanager/WM_api.h')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index d3c1e5f146d..04e3f7e88dc 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -42,6 +42,7 @@ extern "C" { struct ARegion; struct GHashIterator; struct GPUViewport; +struct ID; struct IDProperty; struct ImBuf; struct ImageFormatData; @@ -178,6 +179,10 @@ void WM_autosave_init(struct wmWindowManager *wm); void WM_recover_last_session(struct bContext *C, struct ReportList *reports); void WM_file_tag_modified(void); +struct ID *WM_file_append_datablock(struct bContext *C, + const char *filepath, + const short id_code, + const char *id_name); void WM_lib_reload(struct Library *lib, struct bContext *C, struct ReportList *reports); /* mouse cursors */ |