diff --git a/release/license/THIRD-PARTY-LICENSES.txt b/release/license/THIRD-PARTY-LICENSES.txt index f52379918e0..c3ff14f7b45 100644 --- a/release/license/THIRD-PARTY-LICENSES.txt +++ b/release/license/THIRD-PARTY-LICENSES.txt @@ -398,7 +398,7 @@ Copyright Contributors to the OpenColorIO Project. ** OpenEXR; version 3.1.5 -- https://github.com/AcademySoftwareFoundation/openexr Copyright Contributors to the OpenEXR Project. All rights reserved. -** OpenImageIO; version 2.4.6.0 -- http://www.openimageio.org +** OpenImageIO; version 2.4.9.0 -- http://www.openimageio.org Copyright (c) 2008-present by Contributors to the OpenImageIO project. All Rights Reserved. ** Pystring; version 1.1.3 -- https://github.com/imageworks/pystring diff --git a/scripts/startup/bl_ui/space_node.py b/scripts/startup/bl_ui/space_node.py index 95bf75301f4..8697009b95c 100644 --- a/scripts/startup/bl_ui/space_node.py +++ b/scripts/startup/bl_ui/space_node.py @@ -318,9 +318,9 @@ class NODE_MT_node(Menu): layout.separator() layout.operator("node.clipboard_copy", text="Copy") - row = layout.row() - row.operator_context = 'EXEC_DEFAULT' - row.operator("node.clipboard_paste", text="Paste") + layout.operator_context = 'EXEC_DEFAULT' + layout.operator("node.clipboard_paste", text="Paste") + layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("node.duplicate_move") layout.operator("node.duplicate_move_linked") layout.operator("node.delete") diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index eb4975bebfe..8d38457cc01 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -1141,7 +1141,7 @@ static bool write_file_handle(Main *mainvar, * asap afterward. */ id_lib_extern(id_iter); } - else if (ID_FAKE_USERS(id_iter) > 0) { + else if (ID_FAKE_USERS(id_iter) > 0 && id_iter->asset_data == nullptr) { /* Even though fake user is not directly editable by the user on linked data, it is a * common 'work-around' to set it in library files on data-blocks that need to be linked * but typically do not have an actual real user (e.g. texts, etc.).