blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Minor cleanup of previous hair commits

This commit is contained in:
Luca Rood 2017-05-22 16:34:10 +02:00
parent c0202c0d33
commit cedebeb5de
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/clay/clay_engine.c
View File

@ -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;