BLI_ghash.h was including BLI_blenlib.h, remove from ghash header and include in...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Oct 2011 13:50:24 +0000 (13:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Oct 2011 13:50:24 +0000 (13:50 +0000)
18 files changed:
source/blender/blenkernel/intern/BME_conversions.c
source/blender/blenkernel/intern/BME_eulers.c
source/blender/blenkernel/intern/BME_mesh.c
source/blender/blenkernel/intern/BME_structure.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/nla.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/intern/BLI_args.c
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenloader/intern/readblenentry.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/modifiers/intern/MOD_bevel.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/python/intern/bpy_operator.c

index 9a3c946293475abfc6e77592154c73581b74ba7a..8b5cfe1b882a48dd51f0a42eed8862f5ab15f5ed 100644 (file)
@@ -44,6 +44,7 @@
 #include "DNA_scene_types.h"
 
 #include "BLI_edgehash.h"
+#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_mesh.h"
index 593f50a65e713cdaed27d25d9d60c08431648fd4..bbd439dcb930d3746a66ac2c49c169c7fc3a79d2 100644 (file)
@@ -38,6 +38,7 @@
 
 
 #include "MEM_guardedalloc.h"
+#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
 #include "bmesh_private.h"
index 62a9601da13683b12622c0f673d41dbaf0558e58..e34f2ee1e50d641116284cf657b61deca0fb522d 100644 (file)
@@ -37,7 +37,7 @@
  */
 
 
-
+#include "BLI_listbase.h"
 #include "MEM_guardedalloc.h"
 #include "BKE_bmesh.h"
 #include "bmesh_private.h"
index bd5241adb6b87386661301528317274e575646e2..c385ad4fcdafcdce9d5198d3b2b8c3d634e5546e 100644 (file)
@@ -40,6 +40,7 @@
 #include <limits.h>
 
 #include "MEM_guardedalloc.h"
+#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 #include "BKE_bmesh.h"
 /**
index 8d0c20ecc5221f0bbb6afd7737d24118d230976b..d3c5942b685ff3fe9facf2595132f94d7d68e628 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "BLI_winstuff.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_ghash.h"
 
 #include "DNA_anim_types.h"
index 2cee9676e5e78cd2281d122700c091a2ed6f36da..edddcb4a6b27bdf3f9671c65f0a794dd922dad2c 100644 (file)
@@ -52,6 +52,9 @@
 #include "DNA_meshdata_types.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_path_util.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 
 #include "BKE_bmesh.h"
 #include "BKE_cloth.h"
index 97347d85deb9a5ace5c0ca60324d193287ec40e0..15513675c7a450f3c9491f075f02a7621a3269ca 100644 (file)
@@ -42,6 +42,9 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_path_util.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_ghash.h"
 
 #include "DNA_anim_types.h"
index 65b4a21d0eeaadbf5a2b92dc51663db813bd80a0..8787ec07d9c72cfe13ea738226c51ad3f6c13299 100644 (file)
@@ -68,6 +68,7 @@ variables on the UI for now
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_ghash.h"
 #include "BLI_threads.h"
 
index e4afc6ad79b7a753bcf19391787fc40461e90da0..e4ef834822f6ec18a43e809f9ae59f9d78b63b7b 100644 (file)
 extern "C" {
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "BLI_mempool.h"
-#include "BLI_blenlib.h"
-
 typedef unsigned int   (*GHashHashFP)          (const void *key);
 typedef int                            (*GHashCmpFP)           (const void *a, const void *b);
 typedef        void                    (*GHashKeyFreeFP)       (void *key);
index 82891b1e1211293890434d8fb764350c79b23150..00903aa42cd211aa55fc4478898b0e795736e2e5 100644 (file)
 
 
 #include <ctype.h> /* for tolower */
+#include <string.h>
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_args.h"
 #include "BLI_ghash.h"
 
index 03e3b7ab5602cab7ec60c619c64bac6326562a8b..e34abaf15f9116a083cb9397f25d34d21913f4c2 100644 (file)
  *  \ingroup bli
  */
 
+#include <string.h>
+#include <stdlib.h>
+
 
 #include "MEM_guardedalloc.h"
 
+
+
+// #include "BLI_blenlib.h"
+
+#include "BLI_mempool.h"
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
+
 #include "BLO_sys_types.h" // for intptr_t support
 /***/
 
index 220784c9ff70d6c2827435184a9b4a91f347e539..ded5a95df5abfa1d4a109078c5b0af9477263372 100644 (file)
@@ -44,6 +44,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_ghash.h"
 #include "BLI_linklist.h"
 
index 0375345afccef9c1ebbc424533358b44a61c9951..e264146a6e3dc2bdf123180ecb22c0149670f367 100644 (file)
@@ -39,6 +39,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_string.h"
 #include "BLI_ghash.h"
 
 #include "BKE_animsys.h"
index a32487e7117862ca963ecc95aa699e4edbe3662e..7656e51d2412f864157e025961091b76f38c615d 100644 (file)
@@ -39,6 +39,8 @@
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
+#include "BLI_string.h"
+#include "BLI_listbase.h"
 #include "BLI_ghash.h"
 #include "BLI_threads.h"
 
index 197e6a243426c15d06797eb3323c52c325537958..3397dad24601dca3f252a46699087fe538ef56ed 100644 (file)
@@ -37,6 +37,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_string.h"
 
 #include "BKE_bmesh.h"
 #include "BKE_cdderivedmesh.h"
index 9d83e351b2be3025e218cf234641c1ee3c4b4a71..01245ca4e01afec5eb611d41c2d586331e2f8349 100644 (file)
@@ -43,6 +43,7 @@
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_ghash.h"
 
 #include "BKE_cdderivedmesh.h"
index b7cdac9e246220ff2a00c7f863e63691edc612ef..ad1e080632714f66da16f4d70a7b94bd45e2ab16 100644 (file)
@@ -38,6 +38,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_ghash.h"
 
 #include "DNA_armature_types.h"
index b5fd7851458d0307de993c09c0c24b4c38f26a4d..7e8b9b7b6dfe330c5c8645d227e4623628d740c2 100644 (file)
@@ -44,6 +44,7 @@
 #include "../generic/bpy_internal_import.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_string.h"
 
 #include "RNA_access.h"
 #include "RNA_enum_types.h"