Merge pull request #4 from BabylonJS/master

get from main repo
BabylonJS · Dec 16, 2015 · e7f7bf4 · e7f7bf4
2 parents 8711a02 + 4e477ee
commit e7f7bf4
Show file tree

Hide file tree

Showing 61 changed files with 7,142 additions and 4,426 deletions.
diff --git a/Exporters/Blender/io_export_babylon.py b/Exporters/Blender/io_export_babylon.py
diff --git a/Exporters/Blender/readme.md b/Exporters/Blender/readme.md
@@ -31,6 +31,7 @@ For a discussion of Tower of Babel exporter, along with the difference this expo
  * Animations
 * **Materials**
  * Name
+ * Name space
  * Ambient color
  * Diffuse color
  * Specular color
@@ -46,6 +47,7 @@ For a discussion of Tower of Babel exporter, along with the difference this expo
  * Bump texture
  * Procedural Texture Baking
  * Cycles Render Baking
+ * Check Ready Only Once
 * **Multi-materials**
  * Name
  * Child materials
@@ -71,10 +73,12 @@ For a discussion of Tower of Babel exporter, along with the difference this expo
  * Texture coordinates (2 channels)
  * Vertex colors
  * Visibility
+ * Load disabled
  * Check collisions
  * Billboard
  * Receive and cast shadows
  * Bones (armatures) and bones' animations
+ 	* Variable Max Bone Influencers / vertex
  * Animations
 
 

diff --git a/dist/preview release/babylon.core.js b/dist/preview release/babylon.core.js