Jelajahi Sumber

WebGLPrograms: Honor material.name when naming a program.

Mr.doob 5 tahun lalu
induk
melakukan
7b361d7765
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      src/renderers/webgl/WebGLPrograms.js

+ 2 - 2
src/renderers/webgl/WebGLPrograms.js

@@ -62,7 +62,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 			const shader = ShaderLib[ shaderID ];
 			const shader = ShaderLib[ shaderID ];
 
 
 			shaderobject = {
 			shaderobject = {
-				name: material.type,
+				name: material.name || material.type,
 				uniforms: UniformsUtils.clone( shader.uniforms ),
 				uniforms: UniformsUtils.clone( shader.uniforms ),
 				vertexShader: shader.vertexShader,
 				vertexShader: shader.vertexShader,
 				fragmentShader: shader.fragmentShader
 				fragmentShader: shader.fragmentShader
@@ -71,7 +71,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 		} else {
 		} else {
 
 
 			shaderobject = {
 			shaderobject = {
-				name: material.type,
+				name: material.name || material.type,
 				uniforms: material.uniforms,
 				uniforms: material.uniforms,
 				vertexShader: material.vertexShader,
 				vertexShader: material.vertexShader,
 				fragmentShader: material.fragmentShader
 				fragmentShader: material.fragmentShader