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 | |
| parent | 6bda925aa118bf0de2368c6fbd7387434cfa4dc3 (diff) | |
| parent | dca3d3ef0ef0be81de8b880ad70bc66856e8a401 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_ccg.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/subdiv_inline.h | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_ccg.h b/source/blender/blenkernel/BKE_ccg.h index 65d4688947e..4d0f6d53820 100644 --- a/source/blender/blenkernel/BKE_ccg.h +++ b/source/blender/blenkernel/BKE_ccg.h @@ -33,7 +33,7 @@ */ /* defines BLI_INLINE */ -#include "BLI_utildefines.h" +#include "BLI_compiler_compat.h" /* declares fprintf() and abort(), needed for BLI_assert */ #include <stdio.h> 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" diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index def0de54771..9b8febce756 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -32,7 +32,7 @@ * \ingroup bke */ -#include "BLI_utildefines.h" +#include "BLI_compiler_compat.h" #include "BLI_ghash.h" #include "DNA_listBase.h" diff --git a/source/blender/blenkernel/intern/subdiv_inline.h b/source/blender/blenkernel/intern/subdiv_inline.h index 4dc300e8577..7eebde48bdc 100644 --- a/source/blender/blenkernel/intern/subdiv_inline.h +++ b/source/blender/blenkernel/intern/subdiv_inline.h @@ -30,8 +30,10 @@ #ifndef __SUBDIV_INLINE_H__ #define __SUBDIV_INLINE_H__ +#include "BLI_assert.h" +#include "BLI_compiler_compat.h" + #include "BKE_subdiv.h" -#include "BLI_utildefines.h" BLI_INLINE void BKE_subdiv_ptex_face_uv_to_grid_uv( const float ptex_u, const float ptex_v, |