[Bf-blender-cvs] [c6da3c26557] blender2.8: Fix hair drawing with collection clay settings overrides

[Luca Rood]

Commit: c6da3c26557c1ae8939331680ad7b5ae542d4c67
Author: Luca Rood
Date:   Tue May 16 16:07:45 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBc6da3c26557c1ae8939331680ad7b5ae542d4c67

Fix hair drawing with collection clay settings overrides

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

M	source/blender/draw/engines/clay/clay_engine.c

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

diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c
index 29753868deb..f2cd63f923d 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -372,6 +372,13 @@ static void CLAY_engine_init(void *vedata)
 		}
 	}
 
+	if (e_data.hair_ubo_mat_idxs[1] == 0) {
+		/* Just int to have pointers to them */
+		for (int i = 0; i < MAX_CLAY_MAT; ++i) {
+			e_data.hair_ubo_mat_idxs[i] = i;
+		}
+	}
+
 	if (DRW_state_is_fbo()) {
 		const float *viewport_size = DRW_viewport_size_get();
 		DRWFboTexture tex = {&txl->depth_dup, DRW_BUF_DEPTH_24, 0};