griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Jacques Lucke
2024-03-02 20:20:26 +01:00
parent 6fd0f384d7 cc891aa699
commit b16e4bee1f
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/blenkernel/intern/customdata.cc
View File

@@ -5467,6 +5467,8 @@ void CustomData_blend_read(BlendDataReader *reader, CustomData *data, const int
BLO_read_data_address(reader, &data->external);
blender::Map<void *, const ImplicitSharingInfo *> sharing_info_by_data;
int i = 0;
while (i < data->totlayer) {
CustomDataLayer *layer = &data->layers[i];
@@ -5477,12 +5479,24 @@ void CustomData_blend_read(BlendDataReader *reader, CustomData *data, const int
layer->sharing_info = nullptr;
if (CustomData_verify_versions(data, i)) {
layer->sharing_info = BLO_read_shared(reader, &layer->data, [&]() {
blend_read_layer_data(reader, *layer, count);
return layer->data ? make_implicit_sharing_info_for_layer(
eCustomDataType(layer->type), layer->data, count) :
nullptr;
});
layer->sharing_info = BLO_read_shared(
reader, &layer->data, [&]() -> const ImplicitSharingInfo * {
blend_read_layer_data(reader, *layer, count);
if (layer->data == nullptr) {
return nullptr;
}
const ImplicitSharingInfo *sharing_info = sharing_info_by_data.lookup_default(
layer->data, nullptr);
if (sharing_info != nullptr) {
sharing_info->add_user();
}
else {
sharing_info = make_implicit_sharing_info_for_layer(
eCustomDataType(layer->type), layer->data, count);
sharing_info_by_data.add(layer->data, sharing_info);
}
return sharing_info;
});
i++;
}
}