blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

WIP : Use an extra step of indirection in accessing CustomDataLayers via rna. #108319

Open
Martijn Versteegh wants to merge 3 commits from Baardaap/blender:fix_dangling_customdata_pointers into main
pull from: Baardaap/blender:fix_dangling_customdata_pointers
merge into: blender:main

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

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

@ -2337,8 +2337,7 @@ CustomData CustomData_shallow_copy_remove_non_bmesh_attributes(const CustomData
dst.maxlayer = dst.totlayer = dst_layers.size();
memcpy(dst.layers, dst_layers.data(), dst_layers.as_span().size_in_bytes());
dst.layer_locator = static_cast<CustomDataLayer **>(MEM_malloc_arrayN(dst.totlayer, sizeof(CustomDataLayer *), __func__));
std::fill(dst.layer_locator, dst.layer_locator+dst.totlayer, nullptr);
dst.layer_locator = nullptr;
CustomData_update_typemap(&dst);