Merge branch 'master' of https://github.com/highfidelity/hifi into temp0

examples/libraries/modelUploader.js

@@ -274,19 +274,11 @@ modelUploader = (function () {
             }
         }
 
-        if (view.string(0, 18) === "Kaydara FBX Binary") {
-            previousNodeFilename = "";
-
-            index = 27;
-            while (index < view.byteLength - 39 && !EOF) {
-                parseBinaryFBX();
-            }
-
-        } else {
+  
 
             readTextFBX();
 
-        }
+       
     }
 
     function readModel() {

libraries/entities/src/EntityCollisionSystem.cpp

@@ -144,6 +144,13 @@ void EntityCollisionSystem::updateCollisionWithEntities(EntityItem* entityA) {
             penetration = collision->_penetration;
             entityB = static_cast<EntityItem*>(collision->_extraData);
             
+            // The collision _extraData should be a valid entity, but if for some reason
+            // it's NULL then continue with a warning.
+            if (!entityB) {
+                qDebug() << "UNEXPECTED - we have a collision with missing _extraData. Something went wrong down below!";
+                continue; // skip this loop pass if the entity is NULL
+            }
+            
             // don't collide entities with unknown IDs,
             if (!entityB->isKnownID()) {
                 continue; // skip this loop pass if the entity has an unknown ID

libraries/entities/src/EntityTreeElement.cpp

@@ -585,8 +585,12 @@ bool EntityTreeElement::findShapeCollisions(const Shape* shape, CollisionList& c
         if (shape != otherCollisionShape && !ignoreForCollisions) {
             if (ShapeCollider::collideShapes(shape, otherCollisionShape, collisions)) {
                 CollisionInfo* lastCollision = collisions.getLastCollision();
-                lastCollision->_extraData = entity;
-                atLeastOneCollision = true;
+                if (lastCollision) {
+                    lastCollision->_extraData = entity;
+                    atLeastOneCollision = true;
+                } else {
+                    qDebug() << "UNEXPECTED - ShapeCollider::collideShapes() returned true, but no lastCollision.";
+                }
             }
         }
         ++entityItr;

libraries/octree/src/OctreePersistThread.cpp

@@ -189,6 +189,9 @@ void OctreePersistThread::backup() {
         quint64 intervalToBackup = _backupInterval * MSECS_TO_USECS;
         
         if (sinceLastBackup > intervalToBackup) {
+            qDebug() << "Time since last backup [" << sinceLastBackup << "] exceeds backup interval [" 
+                                    << intervalToBackup << "] doing backup now...";
+
             struct tm* localTime = localtime(&_lastPersistTime);
 
             QString backupFileName;
@@ -213,6 +216,8 @@ void OctreePersistThread::backup() {
             } else {
                 qDebug() << "ERROR in backing up persist file...";
             }
+            
+            _lastBackup = now;
         }
     }
 }