diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-19 19:19:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-19 19:20:50 +0300 |
| commit | 6b433f4eb3da0acf092fb4e5417b10f9b304d073 (patch) | |
| tree | 17d66beede9df8d8b43f9db39265649c2d72e732 /source/blender/draw/intern/draw_hair.c | |
| parent | a7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24 (diff) | |
| parent | a4f2ebc78da4e10e65e864a16d2e621c7c79103d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/intern/draw_hair.c')
| -rw-r--r-- | source/blender/draw/intern/draw_hair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c index 6ede573199f..ebdb4c72d09 100644 --- a/source/blender/draw/intern/draw_hair.c +++ b/source/blender/draw/intern/draw_hair.c @@ -57,7 +57,7 @@ typedef enum ParticleRefineShader { } ParticleRefineShader; static GPUShader *g_refine_shaders[PART_REFINE_MAX_SHADER] = {NULL}; -static DRWPass *g_tf_pass; /* XXX can be a problem with mulitple DRWManager in the future */ +static DRWPass *g_tf_pass; /* XXX can be a problem with multiple DRWManager in the future */ extern char datatoc_common_hair_lib_glsl[]; extern char datatoc_common_hair_refine_vert_glsl[]; |