Merge fixes

This commit is contained in:
viktorljung
2016-02-10 13:44:47 +01:00
parent 49e6252ee1
commit afebf879a0
10 changed files with 348 additions and 241 deletions
+2
View File
@@ -78,6 +78,8 @@ private:
ShaderProgram* m_ExplosionEffectSkinnedProgram;
ShaderProgram* m_ExplosionEffectSplatMapSkinnedProgram;
ShaderProgram* m_ForwardPlusSplatMapSkinnedProgram;
ShaderProgram* m_ShieldToStencilSkinnedProgram;
ShaderProgram* m_FillDepthBufferSkinnedProgram;
};
#endif