Merge branch 'blender-v4.3-release'

This commit is contained in:
Falk David
2024-11-08 16:39:13 +01:00
2 changed files with 3 additions and 0 deletions

View File

@@ -1544,6 +1544,8 @@ LayerGroup::LayerGroup(const LayerGroup &other) : LayerGroup()
}
}
}
this->color_tag = other.color_tag;
}
LayerGroup::~LayerGroup()

View File

@@ -792,6 +792,7 @@ static int grease_pencil_merge_layer_exec(bContext *C, wmOperator *op)
}
GreasePencil *merged_grease_pencil = BKE_grease_pencil_new_nomain();
BKE_grease_pencil_copy_parameters(grease_pencil, *merged_grease_pencil);
ed::greasepencil::merge_layers(
grease_pencil, src_layer_indices_by_dst_layer, *merged_grease_pencil);
BKE_grease_pencil_nomain_to_grease_pencil(merged_grease_pencil, &grease_pencil);