Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorten Mikkelsen <mikkelsen7@gmail.com>2011-12-10 03:26:06 +0400
committerMorten Mikkelsen <mikkelsen7@gmail.com>2011-12-10 03:26:06 +0400
commit965c287630b7528a4a0b146212e8f1783a904948 (patch)
treed54baf4bcaaadc72c6910a0dd48705721bdea5d3 /source/gameengine/Ketsji/BL_BlenderShader.cpp
parent82480e99954f3618e953c5f669577efd72ba3f1f (diff)
fixes scale on derivative maps
Diffstat (limited to 'source/gameengine/Ketsji/BL_BlenderShader.cpp')
-rw-r--r--source/gameengine/Ketsji/BL_BlenderShader.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp
index 6680e9556b9..52c9846772d 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.cpp
+++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp
@@ -8,6 +8,7 @@
#include "BKE_global.h"
#include "BKE_main.h"
+#include "BKE_DerivedMesh.h"
#include "BL_BlenderShader.h"
#include "BL_Material.h"
@@ -146,7 +147,7 @@ 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);
+ GPU_material_bind_uniforms(gpumat, obmat, viewmat, viewinvmat, obcol, ms.m_pDerivedMesh->auto_bump_scale);
mAlphaBlend = GPU_material_alpha_blend(gpumat, obcol);
}