[Bf-blender-cvs] [cedebeb5de0] blender2.8: Minor cleanup of previous hair commits

[Luca Rood]

Commit: cedebeb5de0247c85f096ba339d6a433b42bbcce
Author: Luca Rood
Date:   Mon May 22 16:34:10 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBcedebeb5de0247c85f096ba339d6a433b42bbcce

Minor cleanup of previous hair commits

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

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 27e5a00ad6f..c0f247c9501 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -89,7 +89,7 @@ typedef struct CLAY_HAIR_UBO_Material {
 	float matcap_hsv[3];
 	float pad;
 } CLAY_HAIR_UBO_Material; /* 32 bytes */
-BLI_STATIC_ASSERT_ALIGN(CLAY_UBO_Material, 16)
+BLI_STATIC_ASSERT_ALIGN(CLAY_HAIR_UBO_Material, 16)
 
 typedef struct CLAY_UBO_Storage {
 	CLAY_UBO_Material materials[MAX_CLAY_MAT];
@@ -166,7 +166,6 @@ static struct {
 
 	/* Just a serie of int from 0 to MAX_CLAY_MAT-1 */
 	int ubo_mat_idxs[MAX_CLAY_MAT];
-	int hair_ubo_mat_idxs[MAX_CLAY_MAT];
 
 	/* engine specific */
 	struct GPUTexture *depth_dup;