From e2f82eb94927cc306e802131112c3f0d2fbba6b8 Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Thu, 31 Jan 2019 09:35:42 -0700
Subject: [PATCH] Fix assertion on shapeInfo

---
 .../src/avatars-renderer/Avatar.cpp            | 18 ++++++++++--------
 libraries/shared/src/ShapeInfo.cpp             |  3 ++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 07c1ca9a32..ba5529e1c0 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1733,15 +1733,17 @@ void Avatar::computeShapeInfo(ShapeInfo& shapeInfo) {
 void Avatar::computeDetailedShapeInfo(ShapeInfo& shapeInfo, int jointIndex) {
     if (jointIndex > -1 && jointIndex < (int)_multiSphereShapes.size()) {
         auto& data = _multiSphereShapes[jointIndex].getSpheresData();
-        std::vector<glm::vec3> positions;
-        std::vector<btScalar> radiuses;
-        positions.reserve(data.size());
-        radiuses.reserve(data.size());
-        for (auto& sphere : data) {
-            positions.push_back(sphere._position);
-            radiuses.push_back(sphere._radius);
+        if (data.size() > 0) {
+            std::vector<glm::vec3> positions;
+            std::vector<btScalar> radiuses;
+            positions.reserve(data.size());
+            radiuses.reserve(data.size());
+            for (auto& sphere : data) {
+                positions.push_back(sphere._position);
+                radiuses.push_back(sphere._radius);
+            }
+            shapeInfo.setMultiSphere(positions, radiuses);
         }
-        shapeInfo.setMultiSphere(positions, radiuses);
     }
 }
 
diff --git a/libraries/shared/src/ShapeInfo.cpp b/libraries/shared/src/ShapeInfo.cpp
index 564d79bfda..c256cf2b76 100644
--- a/libraries/shared/src/ShapeInfo.cpp
+++ b/libraries/shared/src/ShapeInfo.cpp
@@ -152,7 +152,8 @@ void ShapeInfo::setSphere(float radius) {
 void ShapeInfo::setMultiSphere(const std::vector<glm::vec3>& centers, const std::vector<float>& radiuses) {
     _url = "";
     _type = SHAPE_TYPE_MULTISPHERE;
-    assert(centers.size() == radiuses.size() && centers.size() > 0);
+    assert(centers.size() == radiuses.size());
+    assert(centers.size() > 0);
     for (size_t i = 0; i < centers.size(); i++) {
         SphereData sphere = SphereData(centers[i], radiuses[i]);
         _sphereCollection.push_back(sphere);