[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41150] trunk/blender/source/blender: BLI_ghash.h was including BLI_blenlib.h, remove from ghash header and include in each file
Campbell Barton
ideasman42 at gmail.com
Thu Oct 20 15:50:24 CEST 2011
Revision: 41150
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41150
Author: campbellbarton
Date: 2011-10-20 13:50:24 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
BLI_ghash.h was including BLI_blenlib.h, remove from ghash header and include in each file
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/BME_conversions.c
trunk/blender/source/blender/blenkernel/intern/BME_eulers.c
trunk/blender/source/blender/blenkernel/intern/BME_mesh.c
trunk/blender/source/blender/blenkernel/intern/BME_structure.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenlib/BLI_ghash.h
trunk/blender/source/blender/blenlib/intern/BLI_args.c
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/python/intern/bpy_operator.c
Modified: trunk/blender/source/blender/blenkernel/intern/BME_conversions.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_conversions.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenkernel/intern/BME_conversions.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/BME_eulers.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_eulers.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenkernel/intern/BME_eulers.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -38,6 +38,7 @@
#include "MEM_guardedalloc.h"
+#include "BLI_listbase.h"
#include "BLI_utildefines.h"
#include "bmesh_private.h"
Modified: trunk/blender/source/blender/blenkernel/intern/BME_mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_mesh.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenkernel/intern/BME_mesh.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -37,7 +37,7 @@
*/
-
+#include "BLI_listbase.h"
#include "MEM_guardedalloc.h"
#include "BKE_bmesh.h"
#include "bmesh_private.h"
Modified: trunk/blender/source/blender/blenkernel/intern/BME_structure.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_structure.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenkernel/intern/BME_structure.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -40,6 +40,7 @@
#include <limits.h>
#include "MEM_guardedalloc.h"
+#include "BLI_listbase.h"
#include "BLI_utildefines.h"
#include "BKE_bmesh.h"
/**
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -68,6 +68,7 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
#include "BLI_ghash.h"
#include "BLI_threads.h"
Modified: trunk/blender/source/blender/blenlib/BLI_ghash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_ghash.h 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenlib/BLI_ghash.h 2011-10-20 13:50:24 UTC (rev 41150)
@@ -39,13 +39,6 @@
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);
Modified: trunk/blender/source/blender/blenlib/intern/BLI_args.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_args.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenlib/intern/BLI_args.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -35,11 +35,13 @@
#include <ctype.h> /* for tolower */
+#include <string.h>
#include "MEM_guardedalloc.h"
+#include "BLI_utildefines.h"
#include "BLI_listbase.h"
-#include "BLI_utildefines.h"
+#include "BLI_string.h"
#include "BLI_args.h"
#include "BLI_ghash.h"
Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -32,11 +32,20 @@
* \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
/***/
Modified: trunk/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readblenentry.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/blenloader/intern/readblenentry.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -37,6 +37,7 @@
#include "MEM_guardedalloc.h"
#include "BLI_utildefines.h"
+#include "BLI_string.h"
#include "BKE_bmesh.h"
#include "BKE_cdderivedmesh.h"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -43,6 +43,7 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
#include "BLI_ghash.h"
#include "BKE_cdderivedmesh.h"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_mask.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_mask.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/modifiers/intern/MOD_mask.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
Modified: trunk/blender/source/blender/python/intern/bpy_operator.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_operator.c 2011-10-20 13:41:52 UTC (rev 41149)
+++ trunk/blender/source/blender/python/intern/bpy_operator.c 2011-10-20 13:50:24 UTC (rev 41150)
@@ -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"
More information about the Bf-blender-cvs
mailing list