Merge branch 'master' into dev

examples/js/loaders/sea3d/SEA3DLoader.js

@@ -1623,30 +1623,30 @@ THREE.SEA3D.prototype.readContainer3D = function( sea ) {
 
 THREE.SEA3D.prototype.readSprite = function( sea ) {
 
-	var material;
+	var mat;
 
 	if ( sea.material ) {
 
 		if ( ! sea.material.tag.sprite ) {
 
-			material = sea.material.tag.sprite = new THREE.SpriteMaterial();
+			mat = sea.material.tag.sprite = new THREE.SpriteMaterial();
 
-			this.setBlending( material, sea.blendMode );
+			this.setBlending( mat, sea.blendMode );
 
-			material.map = sea.material.tag.map;
-			material.map.flipY = true;
+			mat.map = sea.material.tag.map;
+			mat.map.flipY = true;
 
-			material.color.set( sea.material.tag.color );
-			material.opacity = sea.material.tag.opacity;
-			material.blending = sea.material.tag.blending;
-			material.fog = sea.material.receiveFog;
+			mat.color.set( sea.material.tag.color );
+			mat.opacity = sea.material.tag.opacity;
+			mat.blending = sea.material.tag.blending;
+			mat.fog = sea.material.receiveFog;
 
 		}
-		else material = sea.material.tag.sprite;
+		else mat = sea.material.tag.sprite;
 
 	}
 
-	var sprite = new THREE.Sprite( material );
+	var sprite = new THREE.Sprite( mat );
 	sprite.name = sea.name;
 
 	this.domain.sprites = this.sprites = this.sprites || [];
@@ -2189,7 +2189,7 @@ THREE.SEA3D.prototype.createMaterial = function( sea ) {
 
 };
 
-THREE.SEA3D.prototype.setBlending = function( material, blendMode ) {
+THREE.SEA3D.prototype.setBlending = function( mat, blendMode ) {
 
 	if ( blendMode == "normal" ) return;
 

utils/converters/fbx/convert_to_threejs.py

@@ -385,7 +385,7 @@ def generate_material_object(material):
         }
 
     else:
-        print "Unknown type of Material", getMaterialName(material)
+        print ("Unknown type of Material"), getMaterialName(material)
 
     # default to Lambert Material if the current Material type cannot be handeled
     if not material_type:
@@ -2063,7 +2063,7 @@ def copy_textures(textures):
             shutil.copyfile(url, saveFilename)
             texture_dict[url] = True
         except IOError as e:
-            print "I/O error({0}): {1} {2}".format(e.errno, e.strerror, url)
+            print ("I/O error({0}): {1} {2}").format(e.errno, e.strerror, url)
 
 def findFilesWithExt(directory, ext, include_path = True):
     ext = ext.lower()