Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-06-02 09:08:43 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-06-02 09:08:43 +0300
commita8907e409a2feea5a004912c02fcec537040cf3e (patch)
tree531bac5d1df10e531c42f41406316d4120a7c465 /intern/cycles/util
parentc7280ce65b856d26d6807c1b7a081ffc6311bfdc (diff)
parent7881c251f330e60cb9931143c46e302789f8007b (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_guarded_allocator.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h
index 2d09326d2ca..f78cc5f5da9 100644
--- a/intern/cycles/util/util_guarded_allocator.h
+++ b/intern/cycles/util/util_guarded_allocator.h
@@ -18,6 +18,7 @@
#define __UTIL_GUARDED_ALLOCATOR_H__
#include <cstddef>
+#include <cstdlib>
#include <memory>
#ifdef WITH_BLENDER_GUARDEDALLOC