Merge branch 'blender-v4.1-release'
This commit is contained in:
commit
971e82b93a
|
@ -529,9 +529,9 @@ set(MATERIALX_HASH fad8f4e19305fb2ee920cbff638f3560)
|
||||||
set(MATERIALX_HASH_TYPE MD5)
|
set(MATERIALX_HASH_TYPE MD5)
|
||||||
set(MATERIALX_FILE materialx-v${MATERIALX_VERSION}.tar.gz)
|
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_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_HASH_TYPE MD5)
|
||||||
set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
|
set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,7 @@ void BKE_mesh_calc_edges_legacy(Mesh *mesh);
|
||||||
|
|
||||||
void BKE_mesh_do_versions_cd_flag_init(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
|
* Calculate/create edges from tessface data
|
||||||
|
|
|
@ -1375,10 +1375,10 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList *
|
||||||
instantiate_context.active_collection = nullptr;
|
instantiate_context.active_collection = nullptr;
|
||||||
loose_data_instantiate(&instantiate_context);
|
loose_data_instantiate(&instantiate_context);
|
||||||
|
|
||||||
BKE_main_mesh_legacy_convert_auto_smooth(*bmain, true);
|
|
||||||
BKE_main_id_newptr_and_tag_clear(bmain);
|
BKE_main_id_newptr_and_tag_clear(bmain);
|
||||||
|
|
||||||
blendfile_link_append_proxies_convert(bmain, reports);
|
blendfile_link_append_proxies_convert(bmain, reports);
|
||||||
|
BKE_main_mesh_legacy_convert_auto_smooth(*bmain);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BKE_blendfile_link(BlendfileLinkAppendContext *lapp_context, ReportList *reports)
|
void BKE_blendfile_link(BlendfileLinkAppendContext *lapp_context, ReportList *reports)
|
||||||
|
|
|
@ -2261,7 +2261,7 @@ static ModifierData *create_auto_smooth_modifier(Object &object,
|
||||||
|
|
||||||
} // namespace blender::bke
|
} // 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;
|
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) {
|
if (object->type != OB_MESH) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (new_ids_only && (object->id.tag & LIB_TAG_NEW) == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
Mesh *mesh = static_cast<Mesh *>(object->data);
|
Mesh *mesh = static_cast<Mesh *>(object->data);
|
||||||
const float angle = mesh->smoothresh_legacy;
|
const float angle = mesh->smoothresh_legacy;
|
||||||
if (!(mesh->flag & ME_AUTOSMOOTH_LEGACY)) {
|
if (!(mesh->flag & ME_AUTOSMOOTH_LEGACY)) {
|
||||||
|
|
Loading…
Reference in New Issue