[Bf-blender-cvs] [55d53b5] cycles-ptex-49: Compilation fix for game engine
Nicholas Bishop
noreply at git.blender.org
Sat Feb 7 21:15:06 CET 2015
Commit: 55d53b5281a298ec216085c0a69bc89d57d1b6e7
Author: Nicholas Bishop
Date: Sat Feb 7 21:13:45 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB55d53b5281a298ec216085c0a69bc89d57d1b6e7
Compilation fix for game engine
Added null parameter to GPU_material_bind.
===================================================================
M source/gameengine/Ketsji/BL_BlenderShader.cpp
===================================================================
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp
index de6b36b..2624739 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.cpp
+++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp
@@ -77,7 +77,7 @@ void BL_BlenderShader::SetProg(bool enable, double time, RAS_IRasterizer* rasty)
view.getValue((float*)viewmat);
viewinv.getValue((float*)viewinvmat);
- GPU_material_bind(mGPUMat, mLightLayer, mBlenderScene->lay, time, 1, viewmat, viewinvmat, NULL, false);
+ GPU_material_bind(mGPUMat, mLightLayer, mBlenderScene->lay, time, 1, viewmat, viewinvmat, NULL, false, NULL);
}
else
GPU_material_unbind(mGPUMat);
More information about the Bf-blender-cvs
mailing list