[Bf-blender-cvs] [01a614c6990] master: Fix build after last commit
Hans Goudey
noreply at git.blender.org
Fri May 14 00:52:37 CEST 2021
Commit: 01a614c699024b2f8de8d9d795be2428c0dfc5b5
Author: Hans Goudey
Date: Thu May 13 17:52:30 2021 -0500
Branches: master
https://developer.blender.org/rB01a614c699024b2f8de8d9d795be2428c0dfc5b5
Fix build after last commit
Part of a rename change in rBc5d38a2be8 was lost when committing.
===================================================================
M source/blender/functions/FN_generic_virtual_array.hh
===================================================================
diff --git a/source/blender/functions/FN_generic_virtual_array.hh b/source/blender/functions/FN_generic_virtual_array.hh
index 31f649e0358..d8641f7ae80 100644
--- a/source/blender/functions/FN_generic_virtual_array.hh
+++ b/source/blender/functions/FN_generic_virtual_array.hh
@@ -564,7 +564,7 @@ template<typename T> class GVMutableArray_For_VMutableArray : public GVMutableAr
void set_all_impl(const void *src)
{
- varray_->set_all(Span((T *)data, size_));
+ varray_->set_all(Span((T *)src, size_));
}
void materialize_impl(const IndexMask mask, void *dst) const override
@@ -688,7 +688,7 @@ class GVArray_For_EmbeddedVArray : public GVArray_For_VArray<T> {
public:
template<typename... Args>
- GVArray_For_EmbeddedVArray(const int64_t size, Args &&... args)
+ GVArray_For_EmbeddedVArray(const int64_t size, Args &&...args)
: GVArray_For_VArray<T>(size), embedded_varray_(std::forward<Args>(args)...)
{
this->varray_ = &embedded_varray_;
@@ -703,7 +703,7 @@ class GVMutableArray_For_EmbeddedVMutableArray : public GVMutableArray_For_VMuta
public:
template<typename... Args>
- GVMutableArray_For_EmbeddedVMutableArray(const int64_t size, Args &&... args)
+ GVMutableArray_For_EmbeddedVMutableArray(const int64_t size, Args &&...args)
: GVMutableArray_For_VMutableArray<T>(size), embedded_varray_(std::forward<Args>(args)...)
{
this->varray_ = &embedded_varray_;
More information about the Bf-blender-cvs
mailing list