[Bf-blender-cvs] [2154631e852] temp-virtual-array-value-type: cleanups
Jacques Lucke
noreply at git.blender.org
Sun Oct 31 14:28:45 CET 2021
Commit: 2154631e852dcbbbc56b00961b431242f4a93acb
Author: Jacques Lucke
Date: Sun Oct 31 14:20:04 2021 +0100
Branches: temp-virtual-array-value-type
https://developer.blender.org/rB2154631e852dcbbbc56b00961b431242f4a93acb
cleanups
===================================================================
M source/blender/blenlib/BLI_any.hh
M source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
M source/blender/functions/FN_generic_virtual_array.hh
===================================================================
diff --git a/source/blender/blenlib/BLI_any.hh b/source/blender/blenlib/BLI_any.hh
index 34d428d10a2..f52f262e10b 100644
--- a/source/blender/blenlib/BLI_any.hh
+++ b/source/blender/blenlib/BLI_any.hh
@@ -26,6 +26,7 @@
* - Can store additional user-defined type information without increasing the stack size of #Any.
*/
+#include <algorithm>
#include <utility>
#include "BLI_memory_utils.hh"
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index 3f4a65369b0..3941241efea 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@ -72,7 +72,7 @@ static std::optional<eSpreadsheetColumnValueType> cpp_type_to_column_value_type(
void ExtraColumns::foreach_default_column_ids(
FunctionRef<void(const SpreadsheetColumnID &, bool is_extra)> fn) const
{
- for (const auto &item : columns_.items()) {
+ for (const auto item : columns_.items()) {
SpreadsheetColumnID column_id;
column_id.name = (char *)item.key.c_str();
fn(column_id, true);
@@ -644,7 +644,7 @@ static void add_fields_as_extra_columns(SpaceSpreadsheet *sspreadsheet,
const AttributeDomain domain = (AttributeDomain)sspreadsheet->attribute_domain;
const int domain_size = component.attribute_domain_size(domain);
- for (const auto &item : fields_to_show.items()) {
+ for (const auto item : fields_to_show.items()) {
StringRef name = item.key;
const GField &field = item.value;
diff --git a/source/blender/functions/FN_generic_virtual_array.hh b/source/blender/functions/FN_generic_virtual_array.hh
index 1e76a7696fa..8adfc050cf9 100644
--- a/source/blender/functions/FN_generic_virtual_array.hh
+++ b/source/blender/functions/FN_generic_virtual_array.hh
@@ -331,7 +331,7 @@ template<typename T> class GVArrayImpl_For_VArray : public GVArrayImpl {
return true;
}
- bool may_have_ownership() const
+ bool may_have_ownership() const override
{
return varray_.may_have_ownership();
}
@@ -480,7 +480,7 @@ template<typename T> class GVMutableArrayImpl_For_VMutableArray : public GVMutab
return true;
}
- bool may_have_ownership() const
+ bool may_have_ownership() const override
{
return varray_.may_have_ownership();
}
More information about the Bf-blender-cvs
mailing list