Cleanup: remove BLI_blenlib from ghash header

This causes source files to depend on ghash header for BLI_string/rect/listbase. Also quiet warnings.
2017-11-14 17:00:10 +11:00
parent 289f9f42ff
commit b5eeec715e
18 changed files with 46 additions and 30 deletions
--- a/source/blender/blenlib/BLI_ghash.h
+++ b/source/blender/blenlib/BLI_ghash.h
@@ -32,7 +32,6 @@
 *  \ingroup bli
 */

-#include "BLI_blenlib.h"
 #include "BLI_sys_types.h" /* for bool */
 #include "BLI_compiler_attrs.h"

--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -30,6 +30,12 @@

 #include <string.h>

+#include "BLI_listbase.h"
+#include "BLI_mempool.h"
+#include "BLI_string.h"
+#include "BLI_string_utf8.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_object_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_gpu_types.h"
@@ -54,11 +60,6 @@
 #include "BKE_scene.h"
 #include "BKE_workspace.h"

-#include "BLI_listbase.h"
-#include "BLI_mempool.h"
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-
 #include "BLO_readfile.h"
 #include "readfile.h"

--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
@@ -39,6 +39,8 @@

 extern "C" {
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"

 #include "BKE_layer.h"

--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -36,6 +36,7 @@

 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
+#include "BLI_listbase.h"

 #ifdef DEBUG_TIME
 #  include "PIL_time.h"
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -33,12 +33,14 @@
 #include "MEM_guardedalloc.h"

 extern "C" {
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_math.h"
 #include "BKE_anim.h"
 #include "BKE_idcode.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
+#include "BLI_listbase.h"
 } /* extern "C" */

 #include "DNA_object_types.h"
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -43,6 +43,7 @@

 #include "BLI_utildefines.h"
 #include "BLI_threads.h"
+#include "BLI_string.h"

 #include "BKE_global.h"
 #include "BKE_layer.h"
@@ -510,9 +511,9 @@ void update_copy_on_write_scene(const Depsgraph *depsgraph,
 		scene_cow->obedit = NULL;
 	}
 	/* Synchronize active render engine. */
-	BLI_strncpy_utf8(scene_cow->view_render.engine_id,
-	                 scene_orig->view_render.engine_id,
-	                 sizeof(scene_cow->view_render.engine_id));
+	BLI_strncpy(scene_cow->view_render.engine_id,
+	            scene_orig->view_render.engine_id,
+	            sizeof(scene_cow->view_render.engine_id));
 	/* TODO(sergey): What else do we need here? */
 }

--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -28,16 +28,16 @@
 #ifndef __DRW_RENDER_H__
 #define __DRW_RENDER_H__

-#include "BKE_context.h"
-#include "BKE_layer.h"
-#include "BKE_material.h"
-#include "BKE_scene.h"
-
 #include "BLI_listbase.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_string.h"

+#include "BKE_context.h"
+#include "BKE_layer.h"
+#include "BKE_material.h"
+#include "BKE_scene.h"
+
 #include "BLT_translation.h"

 #include "DNA_object_types.h"
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -33,6 +33,7 @@

 #include "BLI_utildefines.h"
 #include "BLI_math_vector.h"
+#include "BLI_string.h"
 #include "BLI_ghash.h"

 #include "DNA_modifier_types.h"
--- a/source/blender/draw/modes/edit_mesh_mode_text.c
+++ b/source/blender/draw/modes/edit_mesh_mode_text.c
@@ -24,6 +24,7 @@
 */

 #include "BLI_math.h"
+#include "BLI_string.h"

 #include "BKE_editmesh.h"
 #include "BKE_global.h"
--- a/source/blender/editors/scene/scene_edit.c
+++ b/source/blender/editors/scene/scene_edit.c
@@ -24,6 +24,9 @@

 #include <stdio.h>

+#include "BLI_compiler_attrs.h"
+#include "BLI_listbase.h"
+
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
@@ -37,9 +40,6 @@
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"

-#include "BLI_compiler_attrs.h"
-#include "BLI_listbase.h"
-
 #include "BLT_translation.h"

 #include "DNA_workspace_types.h"
--- a/source/blender/editors/space_node/node_manipulators.c
+++ b/source/blender/editors/space_node/node_manipulators.c
@@ -24,11 +24,13 @@

 #include <math.h>

-#include "BKE_context.h"
-#include "BKE_image.h"
-
+#include "BLI_utildefines.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
+#include "BLI_rect.h"
+
+#include "BKE_context.h"
+#include "BKE_image.h"

 #include "ED_screen.h"
 #include "ED_manipulator_library.h"
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -24,6 +24,9 @@
 *  \ingroup spoutliner
 */

+#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+
 #include "BKE_context.h"
 #include "BKE_collection.h"
 #include "BKE_layer.h"
@@ -33,8 +36,6 @@
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"

-#include "BLI_listbase.h"
-
 #include "ED_screen.h"

 #include "WM_api.h"
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -446,6 +446,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 	TreeStoreElem *tselem;
 	Object *ob = NULL;

+#if 0
 	PropertyRNA *object_prop_hide, *object_prop_hide_select, *object_prop_hide_render;

 	/* get RNA properties (once) */
@@ -453,6 +454,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 	object_prop_hide_select = RNA_struct_type_find_property(&RNA_Object, "hide_select");
 	object_prop_hide_render = RNA_struct_type_find_property(&RNA_Object, "hide_render");
 	BLI_assert(object_prop_hide && object_prop_hide_select  && object_prop_hide_render);
+#endif


 	for (te = lb->first; te; te = te->next) {
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -44,10 +44,10 @@
 #include "BLI_threads.h"
 #include BLI_SYSTEM_PID_H

-#include "BLO_readfile.h"
-
 #include "DNA_space_types.h"  /* For FILE_MAX_LIBEXTRA */

+#include "BLO_readfile.h"
+
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 #include "IMB_thumbs.h"
--- a/source/blender/python/intern/bpy_library_load.c
+++ b/source/blender/python/intern/bpy_library_load.c
@@ -38,8 +38,6 @@
 #include "BLI_linklist.h"
 #include "BLI_path_util.h"

-#include "BLO_readfile.h"
-
 #include "BKE_main.h"
 #include "BKE_library.h"
 #include "BKE_idcode.h"
@@ -48,6 +46,8 @@

 #include "DNA_space_types.h" /* FILE_LINK, FILE_RELPATH */

+#include "BLO_readfile.h"
+
 #include "bpy_util.h"
 #include "bpy_library.h"

--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
@@ -22,12 +22,13 @@
 *  \ingroup wm
 */

-#include "BKE_context.h"
-
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"

+#include "BKE_context.h"
+
 #include "MEM_guardedalloc.h"

 #include "RNA_access.h"
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -31,6 +31,7 @@

 #include "BLI_listbase.h"
 #include "BLI_math.h"
+#include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_ghash.h"

--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c
@@ -22,12 +22,13 @@
 *  \ingroup wm
 */

-#include "BKE_context.h"
-
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
+#include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"

+#include "BKE_context.h"
 #include "BKE_main.h"

 #include "DNA_screen_types.h"