blender
/
blender
134
424
Fork 606
Code Issues 6.3k Pull Requests 770 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 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b1028d492 - Show all commits

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

@ -2382,7 +2382,9 @@ static void customData_free_layer__internal(CustomDataLayer *layer, const int to
const LayerTypeInfo *typeInfo;
if (layer->anonymous_id != nullptr) {
layer->anonymous_id->cow().user_remove();
if (layer->anonymous_id->cow().user_remove()) {
layer->anonymous_id->cow_delete_self();
}
layer->anonymous_id = nullptr;
}
if (!(layer->flag & CD_FLAG_NOFREE) && layer->data) {

2
source/blender/blenlib/BLI_copy_on_write.h
View File

@ -6,8 +6,8 @@
* \ingroup bli
*/
#include "BLI_assert.h"
#include "BLI_compiler_attrs.h"
#include "BLI_utildefines.h"
#include "BLI_utility_mixins.hh"
#include "DNA_copy_on_write.h"