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/blenlib | |
| parent | 6bda925aa118bf0de2368c6fbd7387434cfa4dc3 (diff) | |
| parent | dca3d3ef0ef0be81de8b880ad70bc66856e8a401 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_rect.h | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/rand.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/rct.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index a6670266643..221d328dd9e 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -34,7 +34,8 @@ */ #include "DNA_vec_types.h" -#include "BLI_utildefines.h" +#include "BLI_sys_types.h" /* bool */ +#include "BLI_compiler_compat.h" struct rctf; struct rcti; diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c index 8613a0ea6dd..c85b471fb2d 100644 --- a/source/blender/blenlib/intern/rand.c +++ b/source/blender/blenlib/intern/rand.c @@ -42,7 +42,7 @@ #include "BLI_math.h" /* defines BLI_INLINE */ -#include "BLI_utildefines.h" +#include "BLI_compiler_compat.h" #include "BLI_sys_types.h" #include "BLI_strict_flags.h" diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index e0d92e8a19f..5b1e378a2da 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -39,8 +39,10 @@ #include <limits.h> #include <float.h> -#include "DNA_vec_types.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" + +#include "DNA_vec_types.h" /* avoid including BLI_math */ static void unit_m4(float m[4][4]); |