提交 95c1ca37 编写于 作者: G gero3

remove material.combine from WebGLProgram

上级 5aa0eafc
......@@ -349,13 +349,13 @@ function generateEnvMapModeDefine( parameters ) {
}
function generateEnvMapBlendingDefine( parameters, material ) {
function generateEnvMapBlendingDefine( parameters ) {
var envMapBlendingDefine = 'ENVMAP_BLENDING_MULTIPLY';
if ( parameters.envMap ) {
switch ( material.combine ) {
switch ( parameters.combine ) {
case MultiplyOperation:
envMapBlendingDefine = 'ENVMAP_BLENDING_MULTIPLY';
......@@ -388,7 +388,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
var shadowMapTypeDefine = generateShadowMapTypeDefine( parameters );
var envMapTypeDefine = generateEnvMapTypeDefine( parameters );
var envMapModeDefine = generateEnvMapModeDefine( parameters );
var envMapBlendingDefine = generateEnvMapBlendingDefine( parameters, material );
var envMapBlendingDefine = generateEnvMapBlendingDefine( parameters );
var gammaFactorDefine = ( renderer.gammaFactor > 0 ) ? renderer.gammaFactor : 1.0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册