diff options
| author | Morten Mikkelsen <mikkelsen7@gmail.com> | 2011-12-10 05:00:12 +0400 |
|---|---|---|
| committer | Morten Mikkelsen <mikkelsen7@gmail.com> | 2011-12-10 05:00:12 +0400 |
| commit | 82b9e4d16f08e8ca1b3fee84226334b3012aaed3 (patch) | |
| tree | 23645a68a5a6dff0edea555df4e9cb35d01927bc /source/gameengine/Ketsji/BL_BlenderShader.cpp | |
| parent | 965c287630b7528a4a0b146212e8f1783a904948 (diff) | |
verify existence of dm
Diffstat (limited to 'source/gameengine/Ketsji/BL_BlenderShader.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_BlenderShader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp index 52c9846772d..0f97898c73f 100644 --- a/source/gameengine/Ketsji/BL_BlenderShader.cpp +++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp @@ -147,7 +147,8 @@ void BL_BlenderShader::Update(const RAS_MeshSlot & ms, RAS_IRasterizer* rasty ) else obcol[0]= obcol[1]= obcol[2]= obcol[3]= 1.0f; - GPU_material_bind_uniforms(gpumat, obmat, viewmat, viewinvmat, obcol, ms.m_pDerivedMesh->auto_bump_scale); + float auto_bump_scale = ms.m_pDerivedMesh!=0 ? ms.m_pDerivedMesh->auto_bump_scale : 1.0f; + GPU_material_bind_uniforms(gpumat, obmat, viewmat, viewinvmat, obcol, auto_bump_scale); mAlphaBlend = GPU_material_alpha_blend(gpumat, obcol); } |