griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Falk David
2024-10-02 18:58:17 +02:00
parent bd1346968c 07ed9b805d
commit e97ea85e37
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/grease_pencil/intern/grease_pencil_merge.cc
View File

@@ -193,16 +193,16 @@ void merge_layers(const GreasePencil &src_grease_pencil,
Map<FramesMapKeyT, InsertKeyframe> 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