blender
/
blender
134
424
Fork 606
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

WIP: use generic copy-on-write system to avoid unnecessary data copies #104470

Closed
Jacques Lucke wants to merge 50 commits from JacquesLucke/blender:temp-copy-on-write-customdata into main
pull from: JacquesLucke/blender:temp-copy-on-write-customdata
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 50 Files Changed 87 +9 -5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 66b4840d90 - Show all commits

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

@ -2436,13 +2436,17 @@ static void customData_free_layer__internal(CustomDataLayer *layer, const int to
}
layer->anonymous_id = nullptr;
}
if (layer->data) {
const eCustomDataType type = eCustomDataType(layer->type);
if (layer->cow == nullptr) {
const eCustomDataType type = eCustomDataType(layer->type);
if (layer->cow == nullptr) {
if (layer->data) {
free_layer_data(type, layer->data, totelem);
}
else if (BLI_cow_user_remove(layer->cow)) {
free_layer_data(type, layer->data, totelem);
}
else {
if (BLI_cow_user_remove(layer->cow)) {
if (layer->data) {
free_layer_data(type, layer->data, totelem);
}
BLI_cow_free(layer->cow);
}
}