Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Nov 2018 01:19:10 +0000 (12:19 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Nov 2018 01:28:26 +0000 (12:28 +1100)
source/blender/blenkernel/BKE_ccg.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/subdiv_inline.h
source/blender/blenlib/BLI_rect.h
source/blender/blenlib/intern/rand.c
source/blender/blenlib/intern/rct.c

index 65d4688947e6e765e460fa40e315ff79a563a8c1..4d0f6d538205a7e423e32156e0ed6ff090ff7421 100644 (file)
@@ -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>
index 3d5a33f99728d793334ee1049d71a8571936bbf8..8f0c81ce4f971ce3c87559b06b820568ba8660d6 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 /* defines BLI_INLINE */
-#include "BLI_utildefines.h"
+#include "BLI_compiler_compat.h"
 
 /* defines CustomDataMask */
 #include "BKE_customdata.h"
index def0de547719911d934a506ec4318afceb7c9577..9b8febce756b4690167a5852ae5e1ce65cdd73b6 100644 (file)
@@ -32,7 +32,7 @@
  *  \ingroup bke
  */
 
-#include "BLI_utildefines.h"
+#include "BLI_compiler_compat.h"
 #include "BLI_ghash.h"
 
 #include "DNA_listBase.h"
index 4dc300e8577b33ece2cfb796c02a222fc78c949a..7eebde48bdc0de620887de3ce32cc995c102b6bc 100644 (file)
 #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,
index a6670266643b795cd67775b833475380905795d3..221d328dd9e6c518d6c46a3135977278791c63dd 100644 (file)
@@ -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;
index 8613a0ea6ddb4c4c8bdfbd5ba5f3831eddaf2ac7..c85b471fb2de85455bb5abab5cb1464e7a708199 100644 (file)
@@ -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"
index e0d92e8a19f2a7884c34fc4ed2dcfe7b8356b01a..5b1e378a2dadc706fb29049e2c65424f9b3bba79 100644 (file)
 #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]);