Merge pull request #1326 from ctrlaltdavid/fix/avatar-crash

digisomni · web-flow · commit 542e070d2d81 · 2021-09-07T13:36:18.000-04:00
Fix avatar crash
diff --git a/libraries/physics/src/MultiSphereShape.cpp b/libraries/physics/src/MultiSphereShape.cpp
@@ -486,7 +486,7 @@ void MultiSphereShape::calculateDebugLines() {
                     break;
                 }
             }
-        }        
+        }
         calculateChamferBox(_debugLines, radiuses, axes, _midPoint);
     } else if (_spheres.size() == 8) {
         std::vector<glm::vec3> axes;
@@ -508,6 +508,10 @@ void MultiSphereShape::connectEdges(std::vector<std::pair<glm::vec3, glm::vec3>>
 }
 
 void MultiSphereShape::calculateChamferBox(std::vector<std::pair<glm::vec3, glm::vec3>>& outLines, const std::vector<float>& radiuses, const std::vector<glm::vec3>& axes, const glm::vec3& translation) {
+    if (radiuses.size() == 0) {
+        return;
+    }
+
     std::vector<std::pair<glm::vec3, glm::vec3>> sphereLines;
     calculateSphereLines(sphereLines, glm::vec3(0.0f), radiuses[0]);
 

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ void MultiSphereShape::calculateDebugLines() {`
`486`	`486`	`break;`
`487`	`487`	`}`
`488`	`488`	`}`
`489`		`- }`
	`489`	`+ }`
`490`	`490`	`calculateChamferBox(_debugLines, radiuses, axes, _midPoint);`
`491`	`491`	`} else if (_spheres.size() == 8) {`
`492`	`492`	`std::vector<glm::vec3> axes;`
`@@ -508,6 +508,10 @@ void MultiSphereShape::connectEdges(std::vector<std::pair<glm::vec3, glm::vec3>>`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`void MultiSphereShape::calculateChamferBox(std::vector<std::pair<glm::vec3, glm::vec3>>& outLines, const std::vector<float>& radiuses, const std::vector<glm::vec3>& axes, const glm::vec3& translation) {`
	`511`	`+ if (radiuses.size() == 0) {`
	`512`	`+ return;`
	`513`	`+ }`
	`514`	`+`
`511`	`515`	`std::vector<std::pair<glm::vec3, glm::vec3>> sphereLines;`
`512`	`516`	`calculateSphereLines(sphereLines, glm::vec3(0.0f), radiuses[0]);`
`513`	`517`