griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compile fix for r.42546 typo

Browse Source
This commit is contained in:
Joshua Leung
2011-12-10 03:24:19 +00:00
parent 0cc887e2e9
commit 3f39fde373
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/intern/gpu_draw.c
View File

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