blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Customdata merging does not check layer limit on destination #111609

Merged
Philipp Oeser merged 1 commits from lichtwerk/blender:111608_a into main 2023-08-29 18:02:44 +02:00
Conversation 5 Commits 1 Files Changed 1 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2230,7 +2230,9 @@ static bool customdata_merge_internal(const CustomData *source,
const int src_layer_flag = src_layer.flag;
if (type != last_type) {
current_type_layer_count = 0;
/* Dont exceed layer count on destination. */
const int layernum_dst = CustomData_number_of_layers(dest, type);
current_type_layer_count = layernum_dst;
max_current_type_layer_count = CustomData_layertype_layers_max(type);
last_active = src_layer.active;
last_render = src_layer.active_rnd;