diff options
| author | Luca Rood <dev@lucarood.com> | 2017-05-22 17:34:10 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-05-22 17:42:08 +0300 |
| commit | cedebeb5de0247c85f096ba339d6a433b42bbcce (patch) | |
| tree | f2eb1f21a3bd5c8897aed84282d5e9dcfad9380e /source/blender/draw/engines/clay | |
| parent | c0202c0d336d4e7bb6cfac0c7ecc8acaf0c426ae (diff) | |
Minor cleanup of previous hair commits
Diffstat (limited to 'source/blender/draw/engines/clay')
| -rw-r--r-- | source/blender/draw/engines/clay/clay_engine.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; |