From 07ed9b805d8028d6ca4e68137938136ff708c831 Mon Sep 17 00:00:00 2001 From: Falk David Date: Wed, 2 Oct 2024 18:56:01 +0200 Subject: [PATCH] Fix: Compile error using clang Clang doesn't allow to capture structured bindings in lambdas. Instead, remove the structured bindings and just use a const reference to the item iterator. --- .../grease_pencil/intern/grease_pencil_merge.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc index 3e9bf161292..2231e2a00a7 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc @@ -193,16 +193,16 @@ void merge_layers(const GreasePencil &src_grease_pencil, Map dst_frames; for (const int src_layer_i : src_layer_indices) { const Layer &src_layer = *src_layers[src_layer_i]; - for (const auto &[key, value] : src_layer.frames().items()) { - if (value.is_end()) { + for (const auto &item : src_layer.frames().items()) { + if (item.value.is_end()) { continue; } - const int duration = src_layer.get_frame_duration_at(key); + const int duration = src_layer.get_frame_duration_at(item.key); BLI_assert(duration >= 0); dst_frames.add_or_modify( - key, + item.key, [&](InsertKeyframe *frame) { - *frame = {value, duration}; + *frame = {item.value, duration}; }, [&](InsertKeyframe *frame) { /* The destination frame is always an implicit hold if at least on of the source