Cycles: svn merge -r41157:41182 ^/trunk/blender

[blender-staging.git] / source / blender / makesrna / intern / makesrna.c

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 871cbad6152b0be3d6960f222d12bbc95bf8f1c1..42b78e3ff7e8ec735008726246e59f890be208d7 100644 (file)
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -2662,6 +2662,11 @@ static const char *cpp_classes = ""
 "class Array {\n"
 "public:\n"
 "      T data[Tsize];\n"
+"\n"
+"   Array() {}\n"
+"      Array(const Array<T, Tsize>& other) { memcpy(data, other.data, sizeof(T)*Tsize); }\n"
+"      const Array<T, Tsize>& operator=(const Array<T, Tsize>& other) { memcpy(data, other.data, sizeof(T)*Tsize); return *this; }\n"
+"\n"
 "      operator T*() { return data; }\n"
 "};\n"
 "\n"
@@ -2678,8 +2683,6 @@ static const char *cpp_classes = ""
 "      operator bool(void)\n"
 "      { return iter.valid != 0; }\n"
 "      const CollectionIterator<T, Tbegin, Tnext, Tend>& operator++() { Tnext(&iter); t = T(iter.ptr); return *this; }\n"
-"      const CollectionIterator<T, Tbegin, Tnext, Tend>& operator=(const CollectionIterator<T, Tbegin, Tnext, Tend>& copy)\n"
-"      { if(init) Tend(&iter); iter= copy.iter; if(iter.internal) iter.internal= MEM_dupallocN(iter.internal); t= copy.t; init= copy.init; return *this; }\n"
 "\n"
 "      T& operator*(void) { return t; }\n"
 "      T* operator->(void) { return &t; }\n"
@@ -2690,6 +2693,8 @@ static const char *cpp_classes = ""
 "      { if(init) Tend(&iter); Tbegin(&iter, (PointerRNA*)&ptr.ptr); t = T(iter.ptr); init = true; }\n"
 "\n"
 "private:\n"
+"      const CollectionIterator<T, Tbegin, Tnext, Tend>& operator=(const CollectionIterator<T, Tbegin, Tnext, Tend>& copy) {}\n"
+""
 "      CollectionPropertyIterator iter;\n"
 "      T t;\n"
 "      bool init;\n"
@@ -2700,8 +2705,8 @@ static const char *cpp_classes = ""
 "public:\n"
 "      Collection(const PointerRNA& p) : ptr(p) {}\n"
 "\n"
-"      CollectionIterator<T, Tbegin, Tnext, Tend> begin()\n"
-"      { CollectionIterator<T, Tbegin, Tnext, Tend> iter; iter.begin(ptr); return iter; }\n"
+"      void begin(CollectionIterator<T, Tbegin, Tnext, Tend>& iter)\n"
+"      { iter.begin(ptr); }\n"
 "      CollectionIterator<T, Tbegin, Tnext, Tend> end()\n"
 "      { return CollectionIterator<T, Tbegin, Tnext, Tend>(); } /* test */ \n"
 "\n"