diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 04:19:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 04:28:26 +0300 |
commit | f6bec570c5cd87a1e8635837650217c783b158e0 (patch) | |
tree | b25b055bf38829b3eed3d3078ab4414baaee4c20 /source/blender/blenkernel/BKE_mesh.h | |
parent | 6bda925aa118bf0de2368c6fbd7387434cfa4dc3 (diff) | |
parent | dca3d3ef0ef0be81de8b880ad70bc66856e8a401 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_mesh.h')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 3d5a33f9972..8f0c81ce4f9 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -32,7 +32,7 @@ */ /* defines BLI_INLINE */ -#include "BLI_utildefines.h" +#include "BLI_compiler_compat.h" /* defines CustomDataMask */ #include "BKE_customdata.h" |