Follow up on mode engine code separation

The settings initialization belong within the engines

5 files changed, 29 insertions, 5 deletions

diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index 4f86e3fcd91..f5ac6e4c6c1 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -28,6 +28,7 @@
 
 //#define WITH_VIEWPORT_CACHE_TEST
 
+struct CollectionEngineSettings;
 struct DRWPass;
 struct Material;
 struct Scene;
@@ -42,4 +43,8 @@ void DRW_pass_free(struct DRWPass *pass);
 void *DRW_material_settings_get(struct Material *ma, const char *engine_name);
 void *DRW_render_settings_get(struct Scene *scene, const char *engine_name);
 
-#endif /* __DRW_ENGINE_H__ */
\ No newline at end of file
+/* Mode engines initialization */
+void OBJECT_collection_settings_create(struct CollectionEngineSettings *ces);
+void EDIT_collection_settings_create(struct CollectionEngineSettings *ces);
+
+#endif /* __DRW_ENGINE_H__ */
diff --git a/source/blender/draw/modes/edit_mode.c b/source/blender/draw/modes/edit_mode.c
index 83c9cdd1901..93b8e026fd9 100644
--- a/source/blender/draw/modes/edit_mode.c
+++ b/source/blender/draw/modes/edit_mode.c
@@ -23,6 +23,7 @@
  *  \ingroup draw
  */
 
+#include "DRW_engine.h"
 #include "DRW_render.h"
 
 #include "draw_mode_pass.h"
@@ -104,4 +105,10 @@ void EDIT_draw(void)
 	DRW_draw_pass(psl->wire_outline_pass);
 	DRW_draw_pass(psl->non_meshes_pass);
 	DRW_draw_pass(psl->ob_center_pass);
-}
\ No newline at end of file
+}
+
+void EDIT_collection_settings_create(CollectionEngineSettings *ces)
+{
+	BLI_assert(ces);
+	BKE_collection_engine_property_add_int(ces, "show_occlude_wire", false);
+}
diff --git a/source/blender/draw/modes/edit_mode.h b/source/blender/draw/modes/edit_mode.h
index 241450ac2b3..66079e96728 100644
--- a/source/blender/draw/modes/edit_mode.h
+++ b/source/blender/draw/modes/edit_mode.h
@@ -26,8 +26,10 @@
 #ifndef __EDIT_MODE_H__
 #define __EDIT_MODE_H__
 
+struct Object;
+
 void EDIT_cache_init(void);
-void EDIT_cache_populate(Object *ob);
+void EDIT_cache_populate(struct Object *ob);
 void EDIT_cache_finish(void);
 
 void EDIT_draw(void);
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 2b553ffcdbc..5c05ca1e819 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -23,6 +23,7 @@
  *  \ingroup draw
  */
 
+#include "DRW_engine.h"
 #include "DRW_render.h"
 
 #include "draw_mode_pass.h"
@@ -88,4 +89,11 @@ void OBJECT_draw(void)
 	DRW_draw_pass(psl->wire_outline_pass);
 	DRW_draw_pass(psl->non_meshes_pass);
 	DRW_draw_pass(psl->ob_center_pass);
-}
\ No newline at end of file
+}
+
+void OBJECT_collection_settings_create(CollectionEngineSettings *ces)
+{
+	BLI_assert(ces);
+	BKE_collection_engine_property_add_int(ces, "show_wire", false);
+	BKE_collection_engine_property_add_int(ces, "show_backface_culling", false);
+}
diff --git a/source/blender/draw/modes/object_mode.h b/source/blender/draw/modes/object_mode.h
index 7cd66d608e7..fda9096203d 100644
--- a/source/blender/draw/modes/object_mode.h
+++ b/source/blender/draw/modes/object_mode.h
@@ -26,8 +26,10 @@
 #ifndef __OBJECT_MODE_H__
 #define __OBJECT_MODE_H__
 
+struct Object;
+
 void OBJECT_cache_init(void);
-void OBJECT_cache_populate(Object *ob);
+void OBJECT_cache_populate(struct Object *ob);
 void OBJECT_cache_finish(void);
 
 void OBJECT_draw(void);