Layers: Per-Collection edit mode parsing

Note: we are now merging all the collection engines (mode and render), which eventually may get slow. But as stated before, this is to expose the functionality, while waiting for proper depsgraph integrated solution.

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/draw/engines/clay/clay.c b/source/blender/draw/engines/clay/clay.c
index 0572f4a0dc9..31a63cce120 100644
--- a/source/blender/draw/engines/clay/clay.c
+++ b/source/blender/draw/engines/clay/clay.c
@@ -559,7 +559,7 @@ static void override_setting(CollectionEngineSettings *ces, const char *name, vo
 static DRWShadingGroup *CLAY_object_shgrp_get(Object *ob, CLAY_StorageList *stl, DRWPass *pass)
 {
 	MaterialEngineSettingsClay *settings = DRW_render_settings_get(NULL, RE_engine_id_BLENDER_CLAY);
-	CollectionEngineSettings *ces = ob->collection_settings;
+	CollectionEngineSettings *ces = BKE_object_collection_engine_get(ob, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_CLAY);
 
 	/* Default Settings */
 	float matcap_rot = settings->matcap_rot;
@@ -623,7 +623,7 @@ static void CLAY_create_cache(CLAY_PassList *passes, CLAY_StorageList *stl, cons
 
 	/* TODO Create hash table of batch based on material id*/
 	Object *ob;
-	DEG_OBJECT_ITER(sl, CLAY_ENGINE, ob);
+	DEG_OBJECT_ITER(sl, ob);
 	{
 		if ((ob->base_flag & BASE_VISIBLED) == 0) {
 			continue;