Commit: 478d67e8586fcf5e2b61124266ba1d655784c09f Author: Sergey Sharybin Date: Sun Feb 15 23:11:33 2015 +0500 Branches: master https://developer.blender.org/rB478d67e8586fcf5e2b61124266ba1d655784c09f
Cycles: Hopefully compilation error fix for OSX =================================================================== M intern/cycles/util/util_aligned_malloc.cpp =================================================================== diff --git a/intern/cycles/util/util_aligned_malloc.cpp b/intern/cycles/util/util_aligned_malloc.cpp index b8bc1de..51f21db 100644 --- a/intern/cycles/util/util_aligned_malloc.cpp +++ b/intern/cycles/util/util_aligned_malloc.cpp @@ -16,6 +16,8 @@ #include "util_aligned_malloc.h" +#include <cassert> + /* Adopted from Libmv. */ #if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
