diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-12 19:10:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 16:00:36 +0300 |
| commit | 3866161da855d2b35ac48ef55958bcb567d4a740 (patch) | |
| tree | e019dee67c4149dbaecae6bd2c60972e3fadcacb /source/blender/makesrna/intern/makesrna.c | |
| parent | 2a9c8da709593b5b6187002797d9bb4363440bd5 (diff) | |
Fix T61457, T61489, T61482: build errors and memory warning in Cycles.
For OIIO 2.x we must use unique_ptr. This also required updating the
guarded allocator for std::move to work. Since C++11 construct/destroy
have a default implementation that also works this case, so we just
leave it out.
Diffstat (limited to 'source/blender/makesrna/intern/makesrna.c')
| -rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 54edf972e1d..b4c664e9c90 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3555,6 +3555,7 @@ static void rna_generate_header(BlenderRNA *UNUSED(brna), FILE *f) static const char *cpp_classes = "" "\n" +"#include <stdlib.h> /* for malloc */\n" "#include <string>\n" "#include <string.h> /* for memcpy */\n" "\n" |