Merge pull request #18961 from Mugen87/dev48

GLTFExporter: Ensure no empty material arrays.

examples/js/exporters/GLTFExporter.js

@@ -896,16 +896,16 @@ THREE.GLTFExporter.prototype = {
 
 			}
 
-			if ( ! outputJSON.materials ) {
+			if ( material.isShaderMaterial ) {
 
-				outputJSON.materials = [];
+				console.warn( 'GLTFExporter: THREE.ShaderMaterial not supported.' );
+				return null;
 
 			}
 
-			if ( material.isShaderMaterial && ! material.isGLTFSpecularGlossinessMaterial ) {
+			if ( ! outputJSON.materials ) {
 
-				console.warn( 'GLTFExporter: THREE.ShaderMaterial not supported.' );
-				return null;
+				outputJSON.materials = [];
 
 			}
 

examples/jsm/exporters/GLTFExporter.js

@@ -918,16 +918,16 @@ GLTFExporter.prototype = {
 
 			}
 
-			if ( ! outputJSON.materials ) {
+			if ( material.isShaderMaterial ) {
 
-				outputJSON.materials = [];
+				console.warn( 'GLTFExporter: THREE.ShaderMaterial not supported.' );
+				return null;
 
 			}
 
-			if ( material.isShaderMaterial && ! material.isGLTFSpecularGlossinessMaterial ) {
+			if ( ! outputJSON.materials ) {
 
-				console.warn( 'GLTFExporter: THREE.ShaderMaterial not supported.' );
-				return null;
+				outputJSON.materials = [];
 
 			}