From ba430d1d22c4148b8eecc027e876d9d7a2c3dff7 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 15 Mar 2024 15:17:32 -0400 Subject: [PATCH 1/2] Revert "Fix #119455: Auto smooth versioning on append applies to existing IDs" This reverts commit c6497dd9f7632db2035b3c265000c22b8e1b56ed. This wasn't working the way I expected, it seems the LIB_TAG_NEW isn't set here. Better to address the fundamental issues anyway. Sorry for the noise. --- source/blender/blenkernel/BKE_mesh_legacy_convert.hh | 2 +- source/blender/blenkernel/intern/blendfile_link_append.cc | 2 +- source/blender/blenkernel/intern/mesh_legacy_convert.cc | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/source/blender/blenkernel/BKE_mesh_legacy_convert.hh b/source/blender/blenkernel/BKE_mesh_legacy_convert.hh index e8f444986cf..fdb1584e374 100644 --- a/source/blender/blenkernel/BKE_mesh_legacy_convert.hh +++ b/source/blender/blenkernel/BKE_mesh_legacy_convert.hh @@ -114,7 +114,7 @@ void BKE_mesh_calc_edges_legacy(Mesh *mesh); void BKE_mesh_do_versions_cd_flag_init(Mesh *mesh); -void BKE_main_mesh_legacy_convert_auto_smooth(Main &bmain, bool new_ids_only = false); +void BKE_main_mesh_legacy_convert_auto_smooth(Main &bmain); /** * Calculate/create edges from tessface data diff --git a/source/blender/blenkernel/intern/blendfile_link_append.cc b/source/blender/blenkernel/intern/blendfile_link_append.cc index 56fdf64ca79..33025afb757 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.cc +++ b/source/blender/blenkernel/intern/blendfile_link_append.cc @@ -1375,10 +1375,10 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList * instantiate_context.active_collection = nullptr; loose_data_instantiate(&instantiate_context); - BKE_main_mesh_legacy_convert_auto_smooth(*bmain, true); BKE_main_id_newptr_and_tag_clear(bmain); blendfile_link_append_proxies_convert(bmain, reports); + BKE_main_mesh_legacy_convert_auto_smooth(*bmain); } void BKE_blendfile_link(BlendfileLinkAppendContext *lapp_context, ReportList *reports) diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc index 5d933f2c35b..596745e6359 100644 --- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc +++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc @@ -2263,7 +2263,7 @@ static ModifierData *create_auto_smooth_modifier(Object &object, } // namespace blender::bke -void BKE_main_mesh_legacy_convert_auto_smooth(Main &bmain, const bool new_ids_only) +void BKE_main_mesh_legacy_convert_auto_smooth(Main &bmain) { using namespace blender::bke; @@ -2279,9 +2279,6 @@ void BKE_main_mesh_legacy_convert_auto_smooth(Main &bmain, const bool new_ids_on if (object->type != OB_MESH) { continue; } - if (new_ids_only && (object->id.tag & LIB_TAG_NEW) == 0) { - continue; - } Mesh *mesh = static_cast(object->data); const float angle = mesh->smoothresh_legacy; if (!(mesh->flag & ME_AUTOSMOOTH_LEGACY)) { From b32554e53b59995f747e11f4eb9befb67fbdb835 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 15 Mar 2024 21:11:04 +0100 Subject: [PATCH 2/2] Build: Upgrade OpenImageDenoise to 2.2.2 Fixing memory leak reported in #119035, and crashes with old AMD drivers and unsupported GPUs. Pull Request: https://projects.blender.org/blender/blender/pulls/119538 --- build_files/build_environment/cmake/versions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index d74f389d3da..81381858c45 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -529,9 +529,9 @@ set(MATERIALX_HASH fad8f4e19305fb2ee920cbff638f3560) set(MATERIALX_HASH_TYPE MD5) set(MATERIALX_FILE materialx-v${MATERIALX_VERSION}.tar.gz) -set(OIDN_VERSION 2.2.1) +set(OIDN_VERSION 2.2.2) set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz) -set(OIDN_HASH a1c5299b2b640a0e0569afcf405c82bf) +set(OIDN_HASH 40c04b0371334ab863230e99a587fd59) set(OIDN_HASH_TYPE MD5) set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)