blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

BLI: remove special cases for is_span and is_single methods 

Those were not implemented consistently and don't really help in practice.
This commit is contained in:
Jacques Lucke 2021-11-25 13:51:23 +01:00
parent d6646f7a8a
commit 447378753d
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/BLI_virtual_array.hh
View File

@ -719,9 +719,6 @@ template<typename T> class VArrayCommon {
bool is_span() const
{
BLI_assert(*this);
if (this->is_empty()) {
return true;
}
return impl_->is_span();
}
@ -742,9 +739,6 @@ template<typename T> class VArrayCommon {
bool is_single() const
{
BLI_assert(*this);
if (impl_->size() == 1) {
return true;
}
return impl_->is_single();
}

13
source/blender/functions/intern/generic_virtual_array.cc
View File

@ -530,9 +530,6 @@ void GVArrayCommon::move_from(GVArrayCommon &&other) noexcept
/* Returns true when the virtual array is stored as a span internally. */
bool GVArrayCommon::is_span() const
{
if (this->is_empty()) {
return true;
}
return impl_->is_span();
}
@ -541,18 +538,12 @@ bool GVArrayCommon::is_span() const
GSpan GVArrayCommon::get_internal_span() const
{
BLI_assert(this->is_span());
if (this->is_empty()) {
return GSpan(impl_->type());
}
return impl_->get_internal_span();
}
/* Returns true when the virtual array returns the same value for every index. */
bool GVArrayCommon::is_single() const
{
if (impl_->size() == 1) {
return true;
}
return impl_->is_single();
}
@ -562,10 +553,6 @@ bool GVArrayCommon::is_single() const
void GVArrayCommon::get_internal_single(void *r_value) const
{
BLI_assert(this->is_single());
if (impl_->size() == 1) {
impl_->get(0, r_value);
return;
}
impl_->get_internal_single(r_value);
}