[Bf-blender-cvs] [e2fb5be] soc-2016-layer_manager: Cleanup: Avoid include in header

[Julian Eisel]

Commit: e2fb5be58c7da75c213aa41d600af2e2700e61a2
Author: Julian Eisel
Date:   Wed Jun 29 18:49:24 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rBe2fb5be58c7da75c213aa41d600af2e2700e61a2

Cleanup: Avoid include in header

Also added comment for open ToDo.

===================================================================

M	source/blender/blenkernel/BKE_object.h
M	source/blender/blenkernel/intern/object_layer.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index b7bb0c9..a77166d 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -48,6 +48,7 @@ struct Main;
 struct RigidBodyWorld;
 struct HookModifierData;
 struct ModifierData;
+struct LayerTree;
 
 void BKE_object_workob_clear(struct Object *workob);
 void BKE_object_workob_calc_parent(struct Scene *scene, struct Object *ob, struct Object *workob);
@@ -273,19 +274,17 @@ bool BKE_object_modifier_update_subframe(struct Scene *scene, struct Object *ob,
 /* -------------------------------------------------------------------- */
 /* Object Layers */
 
-#include "BKE_layer.h" /* XXX */
-
 #define BKE_OBJECTLAYER_BASES_ITER_START(oblayer, idx_name, base_name) \
 	for (int idx_name = 0; idx_name < oblayer->tot_bases; idx_name++) { \
 		Base *base_name = oblayer->bases[idx_name];
 #define BKE_OBJECTLAYER_BASES_ITER_END } (void)0
 
-LayerTreeItem *BKE_objectlayer_add(LayerTree *tree, LayerTreeItem *parent, const char *name);
-void BKE_objectlayer_free(LayerTreeItem *litem);
-void BKE_objectlayer_base_assign(Base *base, LayerTreeItem *litem, const bool has_reserved);
-void BKE_objectlayer_base_unassign(const Base *base, LayerTreeItem *litem);
-void BKE_objectlayer_base_entries_reserve(LayerTreeItem *litem, const unsigned int nentries_reserve);
-LayerTypeObject *BKE_objectlayer_from_base(LayerTree *ltree, const Base *base, const bool inverse);
+struct LayerTreeItem *BKE_objectlayer_add(struct LayerTree *tree, struct LayerTreeItem *parent, const char *name);
+void BKE_objectlayer_free(struct LayerTreeItem *litem);
+void BKE_objectlayer_base_assign(struct Base *base, struct LayerTreeItem *litem, const bool has_reserved);
+void BKE_objectlayer_base_unassign(const struct Base *base, struct LayerTreeItem *litem);
+void BKE_objectlayer_base_entries_reserve(struct LayerTreeItem *litem, const unsigned int nentries_reserve);
+struct LayerTypeObject *BKE_objectlayer_from_base(struct LayerTree *ltree, const struct Base *base, const bool inverse);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/object_layer.c b/source/blender/blenkernel/intern/object_layer.c
index a086304..21eec49 100644
--- a/source/blender/blenkernel/intern/object_layer.c
+++ b/source/blender/blenkernel/intern/object_layer.c
@@ -114,6 +114,7 @@ LayerTypeObject *BKE_objectlayer_from_base(LayerTree *ltree, const Base *base, c
 {
 	BLI_assert(ltree->type == LAYER_TREETYPE_OBJECT);
 
+	/* XXX Does (n^2) lookup. Bases/Objects should have some layer info instead. */
 	for (int i = inverse ? ltree->tot_items - 1 : 0;
 	     inverse ? i >= 0 : i < ltree->tot_items;
 	     inverse ? i-- : i++)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 99e1fc1..dfaccf7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -124,6 +124,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_global.h" // for G
 #include "BKE_group.h"
+#include "BKE_layer.h"
 #include "BKE_library.h" // for which_libbase
 #include "BKE_library_idmap.h"
 #include "BKE_library_query.h"
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 67c9fce..4858bba 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -61,6 +61,7 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_image.h"
 #include "BKE_key.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_global.h"