Browse Source

Fixing bad merge

David Catuhe 11 years ago
parent
commit
3eb5628686

+ 3 - 0
Babylon/Loading/Plugins/babylon.babylonFileLoader.js

@@ -634,6 +634,9 @@ var BABYLON = BABYLON || {};
             for (var index = 0; index < parsedMesh.instances.length; index++) {
                 var parsedInstance = parsedMesh.instances[index];
                 var instance = mesh.createInstance(parsedInstance.name);
+
+                BABYLON.Tags.AddTagsTo(instance, parsedInstance.tags);
+
                 instance.position = BABYLON.Vector3.FromArray(parsedInstance.position);
 
                 if (parsedInstance.rotationQuaternion) {

+ 0 - 1
Babylon/babylon.engine.js

@@ -17,7 +17,6 @@
 
         do {
             count *= 2;
-            count *= 2;
         } while(count < value);
 
         if (count > max)

+ 0 - 1
Babylon/babylon.engine.ts

@@ -16,7 +16,6 @@
 
         do {
             count *= 2;
-            count *= 2;
         } while (count < value);
 
         if (count > max)

File diff suppressed because it is too large
+ 2 - 2
babylon.1.12-beta.js