diff options
Diffstat (limited to 'source/blender/functions/FN_multi_function_params.hh')
| -rw-r--r-- | source/blender/functions/FN_multi_function_params.hh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/functions/FN_multi_function_params.hh b/source/blender/functions/FN_multi_function_params.hh index 67f31a61dc4..9d09378ab63 100644 --- a/source/blender/functions/FN_multi_function_params.hh +++ b/source/blender/functions/FN_multi_function_params.hh @@ -111,7 +111,7 @@ class MFParamsBuilder { this->assert_current_param_name(expected_name); const int param_index = this->current_param_index(); const MFParamType ¶m_type = signature_->param_types[param_index]; - BLI_assert(param_type.category() == MFParamType::SingleOutput); + BLI_assert(param_type.category() == MFParamCategory::SingleOutput); const CPPType &type = param_type.data_type().single_type(); /* An empty span indicates that this is ignored. */ const GMutableSpan dummy_span{type}; @@ -144,8 +144,8 @@ class MFParamsBuilder { GMutableSpan computed_array(int param_index) { BLI_assert(ELEM(signature_->param_types[param_index].category(), - MFParamType::SingleOutput, - MFParamType::SingleMutable)); + MFParamCategory::SingleOutput, + MFParamCategory::SingleMutable)); int data_index = signature_->data_index(param_index); return mutable_spans_[data_index]; } @@ -153,8 +153,8 @@ class MFParamsBuilder { GVectorArray &computed_vector_array(int param_index) { BLI_assert(ELEM(signature_->param_types[param_index].category(), - MFParamType::VectorOutput, - MFParamType::VectorMutable)); + MFParamCategory::VectorOutput, + MFParamCategory::VectorMutable)); int data_index = signature_->data_index(param_index); return *vector_arrays_[data_index]; } @@ -217,7 +217,7 @@ class MFParams { } const GVArray &readonly_single_input(int param_index, StringRef name = "") { - this->assert_correct_param(param_index, name, MFParamType::SingleInput); + this->assert_correct_param(param_index, name, MFParamCategory::SingleInput); int data_index = builder_->signature_->data_index(param_index); return builder_->virtual_arrays_[data_index]; } @@ -230,7 +230,7 @@ class MFParams { */ bool single_output_is_required(int param_index, StringRef name = "") { - this->assert_correct_param(param_index, name, MFParamType::SingleOutput); + this->assert_correct_param(param_index, name, MFParamCategory::SingleOutput); int data_index = builder_->signature_->data_index(param_index); return !builder_->mutable_spans_[data_index].is_empty(); } @@ -242,7 +242,7 @@ class MFParams { } GMutableSpan uninitialized_single_output(int param_index, StringRef name = "") { - this->assert_correct_param(param_index, name, MFParamType::SingleOutput); + this->assert_correct_param(param_index, name, MFParamCategory::SingleOutput); int data_index = builder_->signature_->data_index(param_index); GMutableSpan span = builder_->mutable_spans_[data_index]; if (!span.is_empty()) { @@ -264,7 +264,7 @@ class MFParams { } GMutableSpan uninitialized_single_output_if_required(int param_index, StringRef name = "") { - this->assert_correct_param(param_index, name, MFParamType::SingleOutput); + this->assert_correct_param(param_index, name, MFParamCategory::SingleOutput); int data_index = builder_->signature_->data_index(param_index); return builder_->mutable_spans_[data_index]; } @@ -277,7 +277,7 @@ class MFParams { } const GVVectorArray &readonly_vector_input(int param_index, StringRef name = "") { - this->assert_correct_param(param_index, name, MFParamType::VectorInput); + this->assert_correct_param(param_index, name, MFParamCategory::VectorInput); int data_index = builder_->signature_->data_index(param_index); return *builder_->virtual_vector_arrays_[data_index]; } @@ -289,7 +289,7 @@ class MFParams { } GVectorArray &vector_output(int param_index, StringRef name = "") { - this->assert_correct_param(param_index, name, MFParamType::VectorOutput); + this->assert_correct_param(param_index, name, MFParamCategory::VectorOutput); int data_index = builder_->signature_->data_index(param_index); return *builder_->vector_arrays_[data_index]; } @@ -300,7 +300,7 @@ class MFParams { } GMutableSpan single_mutable(int param_index, StringRef name = "") { - this->assert_correct_param(param_index, name, MFParamType::SingleMutable); + this->assert_correct_param(param_index, name, MFParamCategory::SingleMutable); int data_index = builder_->signature_->data_index(param_index); return builder_->mutable_spans_[data_index]; } @@ -312,7 +312,7 @@ class MFParams { } GVectorArray &vector_mutable(int param_index, StringRef name = "") { - this->assert_correct_param(param_index, name, MFParamType::VectorMutable); + this->assert_correct_param(param_index, name, MFParamCategory::VectorMutable); int data_index = builder_->signature_->data_index(param_index); return *builder_->vector_arrays_[data_index]; } @@ -329,7 +329,7 @@ class MFParams { #endif } - void assert_correct_param(int param_index, StringRef name, MFParamType::Category category) + void assert_correct_param(int param_index, StringRef name, MFParamCategory category) { UNUSED_VARS_NDEBUG(param_index, name, category); #ifdef DEBUG |