diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2016-12-23 17:36:16 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2016-12-23 17:36:16 +0300 |
commit | 605263177b8eea24c1449e4dbf0138175ec3dddf (patch) | |
tree | ea297c777bcfae7c647ca88c48b8df3f8f3bd843 /source/blender/makesrna/intern | |
parent | 76c4f0ec6c61bdc33ae908849f632771a1f997c0 (diff) | |
parent | b47c912f4be877bf5511117864dfc2a5b30c0dca (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index a44f53342bd..d9c5865b219 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3763,7 +3763,7 @@ static const char *cpp_classes = "" "\n" "private:\n" " const CollectionIterator<T, Tbegin, Tnext, Tend>& operator = " -"(const CollectionIterator<T, Tbegin, Tnext, Tend>& copy) {}\n" +"(const CollectionIterator<T, Tbegin, Tnext, Tend>& /*copy*/) {}\n" "" " CollectionPropertyIterator iter;\n" " T t;\n" |