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:
authorCampbell Barton <ideasman42@gmail.com>2017-08-21 08:41:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-08-21 08:41:03 +0300
commit3e555d3d785b17bf9398d7666d5131c994da8c6b (patch)
treed15aaa353e31ed2acbd105d2b48ac4b1c99ea1e5 /source/gameengine
parentd007828ae78d66cdcc005d9ba3ad57e987f0190a (diff)
parent0033f0e161d984b38d3a36d18448f16baef121aa (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Expressions/EXP_PyObjectPlus.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Expressions/EXP_PyObjectPlus.h b/source/gameengine/Expressions/EXP_PyObjectPlus.h
index 32dc79cf6eb..504d79f7cbb 100644
--- a/source/gameengine/Expressions/EXP_PyObjectPlus.h
+++ b/source/gameengine/Expressions/EXP_PyObjectPlus.h
@@ -44,7 +44,8 @@
#include "STR_String.h"
#include "MT_Vector3.h"
#include "SG_QList.h"
-#include <stddef.h>
+#include <cstddef>
+#include <cstdint>
#ifdef WITH_PYTHON
#ifdef USE_MATHUTILS