diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-11-16 01:52:16 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-11-16 01:52:16 +0300 |
| commit | f25f7fd9f1a651485041b1e60d55c51784075053 (patch) | |
| tree | 6d767ce978034bd54ce14ca1688db409ebe9458a /source/blender/editors/screen/workspace_edit.c | |
| parent | 145077bea75414daea1d338853199d3b5fe8336e (diff) | |
| parent | ae8130e28740ec2d985f1e54312eeba6527f81cc (diff) | |
Merge branch 'blender2.8' into topbar
Diffstat (limited to 'source/blender/editors/screen/workspace_edit.c')
| -rw-r--r-- | source/blender/editors/screen/workspace_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 2229ecce408..4d1b89634e3 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -379,9 +379,9 @@ static void workspace_append_button( lib_path, sizeof(lib_path), from_main->name, BKE_idcode_to_name(GS(id->name)), NULL); BLI_assert(STREQ(ot_append->idname, "WM_OT_append")); - opptr = uiItemFullO_ptr( - layout, ot_append, workspace->id.name + 2, ICON_NONE, NULL, - WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); + uiItemFullO_ptr( + layout, ot_append, workspace->id.name + 2, ICON_NONE, NULL, + WM_OP_EXEC_DEFAULT, 0, &opptr); RNA_string_set(&opptr, "directory", lib_path); RNA_string_set(&opptr, "filename", id->name + 2); } |