tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.1-release'

This commit is contained in:
Brecht Van Lommel 2024-03-15 21:13:19 +01:00
parent a4a26bf90d b32554e53b
commit 971e82b93a
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/build_environment/cmake/versions.cmake
View File

@ -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)

2
source/blender/blenkernel/BKE_mesh_legacy_convert.hh
View File

@ -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

2
source/blender/blenkernel/intern/blendfile_link_append.cc
View File

@ -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)

5
source/blender/blenkernel/intern/mesh_legacy_convert.cc
View File

@ -2261,7 +2261,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;
@ -2277,9 +2277,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<Mesh *>(object->data);
const float angle = mesh->smoothresh_legacy;
if (!(mesh->flag & ME_AUTOSMOOTH_LEGACY)) {