Browse Source

Updated builds.

Mr.doob 9 years ago
parent
commit
a4b1136289
2 changed files with 9 additions and 4 deletions
  1. 9 4
      build/three.js
  2. 0 0
      build/three.min.js

+ 9 - 4
build/three.js

@@ -11549,17 +11549,22 @@
 
 
 		var prefixVertex, prefixFragment;
 		var prefixVertex, prefixFragment;
 
 
-		if ( (material && material.isRawShaderMaterial) ) {
+		if ( material.isRawShaderMaterial ) {
 
 
 			prefixVertex = [
 			prefixVertex = [
 
 
-				customDefines
+				customDefines,
+
+				'\n'
 
 
 			].filter( filterEmptyLine ).join( '\n' );
 			].filter( filterEmptyLine ).join( '\n' );
 
 
 			prefixFragment = [
 			prefixFragment = [
 
 
-				customDefines
+				customExtensions,
+				customDefines,
+
+				'\n'
 
 
 			].filter( filterEmptyLine ).join( '\n' );
 			].filter( filterEmptyLine ).join( '\n' );
 
 
@@ -11748,7 +11753,7 @@
 		fragmentShader = parseIncludes( fragmentShader, parameters );
 		fragmentShader = parseIncludes( fragmentShader, parameters );
 		fragmentShader = replaceLightNums( fragmentShader, parameters );
 		fragmentShader = replaceLightNums( fragmentShader, parameters );
 
 
-		if ( (material && material.isShaderMaterial) === false ) {
+		if ( ! material.isShaderMaterial ) {
 
 
 			vertexShader = unrollLoops( vertexShader );
 			vertexShader = unrollLoops( vertexShader );
 			fragmentShader = unrollLoops( fragmentShader );
 			fragmentShader = unrollLoops( fragmentShader );

File diff suppressed because it is too large
+ 0 - 0
build/three.min.js


Some files were not shown because too many files changed in this diff