Commit: 2cfb80f68cc28d3e909662bf3527d33577409239
Author: Jacques Lucke
Date: Tue Oct 8 10:48:46 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rB2cfb80f68cc28d3e909662bf3527d33577409239
cleanup
===================================================================
M source/blender/blenkernel/BKE_generic_array_ref.h
M source/blender/blenkernel/intern/generic_array_ref.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_generic_array_ref.h
b/source/blender/blenkernel/BKE_generic_array_ref.h
index e84efa5edf9..4c9fe1359c2 100644
--- a/source/blender/blenkernel/BKE_generic_array_ref.h
+++ b/source/blender/blenkernel/BKE_generic_array_ref.h
@@ -46,7 +46,7 @@ class ArrayRefCPPType : public CPPType {
CPPType &m_base_type;
public:
- ArrayRefCPPType(CPPType &base_type, CPPType &generalization);
+ ArrayRefCPPType(CPPType &base_type);
static void ConstructDefaultCB(const CPPType *self, void *ptr)
{
diff --git a/source/blender/blenkernel/intern/generic_array_ref.cc
b/source/blender/blenkernel/intern/generic_array_ref.cc
index 7822291be17..6f9072acf68 100644
--- a/source/blender/blenkernel/intern/generic_array_ref.cc
+++ b/source/blender/blenkernel/intern/generic_array_ref.cc
@@ -24,16 +24,15 @@ ArrayRefCPPType &get_generic_array_ref_cpp_type(CPPType
&base)
TypeMapping &mapping = get_mapping();
auto &type = mapping.lookup_or_add(&base, [&]() {
- CPPType &generalization = get_cpp_type<GenericArrayRef>();
- ArrayRefCPPType *new_type = new ArrayRefCPPType(base, generalization);
+ ArrayRefCPPType *new_type = new ArrayRefCPPType(base);
return std::unique_ptr<ArrayRefCPPType>(new_type);
});
return *type;
}
-ArrayRefCPPType::ArrayRefCPPType(CPPType &base_type, CPPType &generalization)
+ArrayRefCPPType::ArrayRefCPPType(CPPType &base_type)
: CPPType("GenericArrayRef for " + base_type.name(),
- generalization,
+ get_cpp_type<GenericArrayRef>(),
ArrayRefCPPType::ConstructDefaultCB),
m_base_type(base_type)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
