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

GPv3: Add function to get the index of a layer

Browse Source
This commit is contained in:
Falk David
2024-01-15 17:01:43 +01:00
parent ef6b6031de
commit 35e8959d77
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/grease_pencil.cc
View File

@@ -1908,6 +1908,16 @@ blender::Span<blender::bke::greasepencil::TreeNode *> GreasePencil::nodes_for_wr
return this->root_group().nodes_for_write();
}
std::optional<int> GreasePencil::get_layer_index(
const blender::bke::greasepencil::Layer &layer) const
{
const int index = this->layers().first_index_try(&layer);
if (index == -1) {
return {};
}
return index;
}
const blender::bke::greasepencil::Layer *GreasePencil::get_active_layer() const
{
if (this->active_layer == nullptr) {
@@ -2174,7 +2184,7 @@ blender::IndexMask GreasePencil::layer_selection_by_name(const blender::StringRe
}
if (node->is_layer()) {
const int64_t index = this->layers().first_index(&node->as_layer());
const int index = *this->get_layer_index(node->as_layer());
return blender::IndexMask::from_indices(Span{index}, memory);
}
else if (node->is_group()) {

3
source/blender/makesdna/DNA_grease_pencil_types.h
View File

@@ -462,6 +462,9 @@ typedef struct GreasePencil {
blender::Span<const blender::bke::greasepencil::TreeNode *> nodes() const;
blender::Span<blender::bke::greasepencil::TreeNode *> nodes_for_write();
/* Return the index of the layer if it's found, otherwise std::nullopt. */
std::optional<int> get_layer_index(const blender::bke::greasepencil::Layer &layer) const;
/* Active layer functions. */
bool has_active_layer() const;
const blender::bke::greasepencil::Layer *get_active_layer() const;