From 3751e05ce3ed10337f4eabc76616bf408c23f765 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 17 Sep 2014 13:37:16 -0700 Subject: [PATCH] Fixes crash in Model::scaleToFit() --- interface/src/renderer/Model.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index 2e8fc32566..7f83147bb8 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -894,6 +894,10 @@ void Model::setScaleToFit(bool scaleToFit, const glm::vec3& dimensions) { } void Model::setScaleToFit(bool scaleToFit, float largestDimension) { + if (!isActive()) { + return; + } + if (_scaleToFit != scaleToFit || glm::length(_scaleToFitDimensions) != largestDimension) { _scaleToFit = scaleToFit;