Merge branch 'dev' of https://github.com/CoDEmanX/three.js into dev

utils/exporters/blender/2.65/scripts/addons/io_mesh_threejs/__init__.py

@@ -25,8 +25,7 @@ bl_info = {
     "name": "three.js format",
     "author": "mrdoob, kikko, alteredq, remoe, pxf, n3tfr34k",
     "version": (1, 4, 0),
-    "blender": (2, 6, 5),
-    "api": 35622,
+    "blender": (2, 65, 0),
     "location": "File > Import-Export",
     "description": "Import-Export three.js meshes",
     "warning": "",
@@ -322,7 +321,7 @@ class ExportTHREEJS(bpy.types.Operator, ExportHelper):
 
     @classmethod
     def poll(cls, context):
-        return context.active_object != None
+        return context.active_object is not None
 
     def execute(self, context):
         print("Selected: " + context.active_object.name)

utils/exporters/blender/2.65/scripts/addons/io_mesh_threejs/export_threejs.py

@@ -714,7 +714,7 @@ def generate_bones(option_bones, flipyz):
     TEMPLATE_BONE = '{"parent":%d,"name":"%s","pos":[%g,%g,%g],"rotq":[0,0,0,1]}'
 
     for bone in armature.bones:
-        if bone.parent == None:
+        if bone.parent is None:
             if flipyz:
                 joint = TEMPLATE_BONE % (-1, bone.name, bone.head.x, bone.head.z, -bone.head.y)
                 hierarchy.append(joint)
@@ -959,7 +959,7 @@ def position(bone, frame):
 
     position = position * bone.matrix_local.inverted()
 
-    if bone.parent == None:
+    if bone.parent is None:
 
         position.x += bone.head.x
         position.y += bone.head.y

utils/exporters/blender/2.66/scripts/addons/io_mesh_threejs/__init__.py

@@ -321,7 +321,7 @@ class ExportTHREEJS(bpy.types.Operator, ExportHelper):
 
     @classmethod
     def poll(cls, context):
-        return context.active_object != None
+        return context.active_object is not None
 
     def execute(self, context):
         print("Selected: " + context.active_object.name)

utils/exporters/blender/2.66/scripts/addons/io_mesh_threejs/export_threejs.py

@@ -778,7 +778,7 @@ def generate_bones(option_bones, flipyz):
     for bone in armature.bones:
         bonePos = None
         boneIndex = None
-        if bone.parent == None:
+        if bone.parent is None:
             bonePos = bone.head_local
             boneIndex = -1
         else:
@@ -1036,7 +1036,7 @@ def position(bone, frame, action, armatureMatrix):
 
     position = position * bone.matrix_local.inverted()
 
-    if bone.parent == None:
+    if bone.parent is None:
 
         position.x += bone.head.x
         position.y += bone.head.y