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/intern/subdiv_inline.h | |
parent | 6bda925aa118bf0de2368c6fbd7387434cfa4dc3 (diff) | |
parent | dca3d3ef0ef0be81de8b880ad70bc66856e8a401 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/subdiv_inline.h')
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_inline.h | 4 |
1 files changed, 3 insertions, 1 deletions
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, |