diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-18 08:23:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-18 08:23:38 +0300 |
| commit | 372fd07a8e13613e0e4ecfda2951fc0d2747d8d4 (patch) | |
| tree | 771decf933c1892dced629d844e4e43463c7da88 /source/blender/blenkernel/intern/blender_copybuffer.c | |
| parent | afc4cd1e678b2e0717115d03910af58456f4a038 (diff) | |
Fix paste/append w/ local-view
Paste in local-view wasn't setting local-view bits.
Diffstat (limited to 'source/blender/blenkernel/intern/blender_copybuffer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender_copybuffer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index 7b149761952..004aaf2801c 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -98,7 +98,7 @@ bool BKE_copybuffer_read(Main *bmain_dst, const char *libname, ReportList *repor /* Here appending/linking starts. */ Main *mainl = BLO_library_link_begin(bmain_dst, &bh, libname); BLO_library_link_copypaste(mainl, bh); - BLO_library_link_end(mainl, &bh, 0, NULL, NULL, NULL); + BLO_library_link_end(mainl, &bh, 0, NULL, NULL, NULL, NULL); /* Mark all library linked objects to be updated. */ BKE_main_lib_objects_recalc_all(bmain_dst); IMB_colormanagement_check_file_config(bmain_dst); @@ -121,6 +121,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); + View3D *v3d = CTX_wm_view3d(C); /* may be NULL. */ Main *mainl = NULL; Library *lib; BlendHandle *bh; @@ -145,7 +146,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re BLO_library_link_copypaste(mainl, bh); - BLO_library_link_end(mainl, &bh, flag, bmain, scene, view_layer); + BLO_library_link_end(mainl, &bh, flag, bmain, scene, view_layer, v3d); /* mark all library linked objects to be updated */ BKE_main_lib_objects_recalc_all(bmain); |