diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-12-10 07:24:19 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-12-10 07:24:19 +0400 |
| commit | 3f39fde3739aaafecd794786aeed896d4f228403 (patch) | |
| tree | 78fac45ad882f4effdaf8fb3c139accbd7f932ce /source/blender/gpu | |
| parent | 0cc887e2e9428c0a6715e322071c30e6d10e2506 (diff) | |
Compile fix for r.42546 typo
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index d63be22bc13..4af0cceb4e0 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1162,7 +1162,7 @@ int GPU_enable_material(int nr, void *attribs) GPU_material_vertex_attributes(gpumat, gattribs); GPU_material_bind(gpumat, GMS.gob->lay, GMS.glay, 1.0, !(GMS.gob->mode & OB_MODE_TEXTURE_PAINT)); - auto_bump_scale = GMS.gob->derivedFinal != NULL GMS.gob->derivedFinal->auto_bump_scale : 1.0f; + auto_bump_scale = GMS.gob->derivedFinal != NULL ? GMS.gob->derivedFinal->auto_bump_scale : 1.0f; GPU_material_bind_uniforms(gpumat, GMS.gob->obmat, GMS.gviewmat, GMS.gviewinv, GMS.gob->col, auto_bump_scale); GMS.gboundmat= mat; |