Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing

fix issues in model import sizing caused by recent refactor

libraries/entities-renderer/src/RenderableModelEntityItem.cpp

@@ -75,9 +75,12 @@ RenderableModelEntityItem::RenderableModelEntityItem(const EntityItemID& entityI
 RenderableModelEntityItem::~RenderableModelEntityItem() { }
 
 void RenderableModelEntityItem::setDimensions(const glm::vec3& value) {
+    glm::vec3 newDimensions = glm::max(value, glm::vec3(0.0f)); // can never have negative dimensions
+    if (getDimensions() != newDimensions) {
         _dimensionsInitialized = true;
         ModelEntityItem::setDimensions(value);
     }
+}
 
 QVariantMap parseTexturesToMap(QString textures, const QVariantMap& defaultTextures) {
     // If textures are unset, revert to original textures
@@ -1160,7 +1163,6 @@ bool ModelEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPoin
             return true;
         }
 
-
         if (model->getScaleToFitDimensions() != entity->getDimensions() ||
             model->getRegistrationPoint() != entity->getRegistrationPoint()) {
             return true;

libraries/entities/src/EntityItem.cpp

@@ -1622,11 +1622,13 @@ void EntityItem::setDimensions(const glm::vec3& value) {
     if (getDimensions() != newDimensions) {
         withWriteLock([&] {
             _dimensions = newDimensions;
-            _dirtyFlags |= (Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS);
-            _queryAACubeSet = false;
         });
         locationChanged();
         dimensionsChanged();
+        withWriteLock([&] {
+            _dirtyFlags |= (Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS);
+            _queryAACubeSet = false;
+        });
     }
 }