diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-26 15:24:50 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-05-26 15:24:50 +0300 |
commit | e790f1a8dc18cdc2906d2cf415271b1d91baca14 (patch) | |
tree | 0c70fe0cacddbf49f196fd54cfefec7d76178289 /source/blender/makesrna/intern/makesrna.c | |
parent | 23520cbd13798b1d9db738f76012e91b3ce85c85 (diff) | |
parent | 2a692e05c872e603bd7089b021c2e49edec6290a (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/makesrna/intern/makesrna.c')
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 5506bfaaaf0..9153130546e 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -4709,7 +4709,8 @@ static const char *cpp_classes = " DynamicArray() : data(NULL), length(0) {}\n" " DynamicArray(int new_length) : data(NULL), length(new_length) { data = (T " "*)malloc(sizeof(T) * new_length); }\n" - " DynamicArray(const DynamicArray<T>& other) { copy_from(other); }\n" + " DynamicArray(const DynamicArray<T>& other) : data(NULL), length(0) { copy_from(other); " + "}\n" " const DynamicArray<T>& operator = (const DynamicArray<T>& other) { copy_from(other); " "return *this; }\n" "\n" |