diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:21:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:27:03 +0300 |
commit | 941484ff81744ad2dca1741f3e9c4b4c18664a82 (patch) | |
tree | 3d80e516e39a7d55be8439c2ce3e06943de0a3f6 /source/blender/editors/screen/workspace_edit.c | |
parent | 0dd98af2559b89149f2b6ae586969c0544c26369 (diff) | |
parent | 7fb393f9ba3866026c8fb2c5c5ef7e0906cfe8b4 (diff) |
Merge branch 'master' into blender2.8
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 d64420fb976..e90c63f7a45 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -381,9 +381,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); } |