From 257d3f85382a51e98b0cd7ef8e3e5fb5879918ef Mon Sep 17 00:00:00 2001
From: Malin Ejdbo <malin.ejdbo@gmail.com>
Date: Fri, 4 Jun 2021 10:16:48 +0200
Subject: [PATCH] Update model bounding sphere to account for parent scale,
 closes #1630

---
 modules/base/rendering/renderablemodel.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 892c7d6bd1..9b33abab36 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -575,7 +575,6 @@ void RenderableModel::initializeGL() {
 
     _geometry->initialize();
     _geometry->calculateBoundingRadius();
-    setBoundingSphere(_geometry->boundingRadius() * _modelScale);
 }
 
 void RenderableModel::deinitializeGL() {
@@ -717,6 +716,10 @@ void RenderableModel::update(const UpdateData& data) {
         ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
     }
 
+    setBoundingSphere(_geometry->boundingRadius() * _modelScale *
+        glm::compMax(data.modelTransform.scale)
+    );
+
     if (_geometry->hasAnimation() && !_animationStart.empty()) {
         double relativeTime;
         double now = data.time.j2000Seconds();