浏览代码

Merge pull request #7782 from leonsal/dev

Removed inexistent AdditiveAlphaBlending mode from the examples
Mr.doob 9 年之前
父节点
当前提交
fda68826d5
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      examples/webgl_materials_blending.html
  2. 1 1
      examples/webgl_materials_blending_custom.html

+ 1 - 1
examples/webgl_materials_blending.html

@@ -72,7 +72,7 @@
 
 				// OBJECTS
 
-				var blendings = [ "NoBlending", "NormalBlending", "AdditiveBlending", "SubtractiveBlending", "MultiplyBlending", "AdditiveAlphaBlending" ];
+				var blendings = [ "NoBlending", "NormalBlending", "AdditiveBlending", "SubtractiveBlending", "MultiplyBlending" ];
 
 				var map0 = THREE.ImageUtils.loadTexture( 'textures/UV_Grid_Sm.jpg' );
 				var map1 = THREE.ImageUtils.loadTexture( 'textures/sprite0.jpg' );

+ 1 - 1
examples/webgl_materials_blending_custom.html

@@ -200,7 +200,7 @@
 
 				// FOREGROUND OBJECTS
 
-				var blendings = [ "NoBlending", "NormalBlending", "AdditiveBlending", "SubtractiveBlending", "MultiplyBlending", "AdditiveAlphaBlending" ];
+				var blendings = [ "NoBlending", "NormalBlending", "AdditiveBlending", "SubtractiveBlending", "MultiplyBlending" ];
 
 				var src = [ "ZeroFactor", "OneFactor", "SrcAlphaFactor", "OneMinusSrcAlphaFactor", "DstAlphaFactor", "OneMinusDstAlphaFactor", "DstColorFactor", "OneMinusDstColorFactor", "SrcAlphaSaturateFactor" ];
 				var dst = [ "ZeroFactor", "OneFactor", "SrcColorFactor", "OneMinusSrcColorFactor", "SrcAlphaFactor", "OneMinusSrcAlphaFactor", "DstAlphaFactor", "OneMinusDstAlphaFactor" ];