Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid filling log with bogus warning

Browse source
This commit is contained in:
Seth Alves 2017-01-13 12:00:51 -08:00
parent a3620ad9fe
commit 5a81dface9
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/render-utils/src/Model.cpp
View file

@ -142,16 +142,19 @@ void Model::setSpatiallyNestableOverride(SpatiallyNestablePointer override) {
Transform Model::getTransform() const { Transform Model::getTransform() const {
SpatiallyNestablePointer spatiallyNestableOverride = _spatiallyNestableOverride.lock(); SpatiallyNestablePointer spatiallyNestableOverride = _spatiallyNestableOverride.lock();
if (spatiallyNestableOverride) { if (spatiallyNestableOverride) {
Transform transform = spatiallyNestableOverride->getTransform(); bool success;
transform.setScale(getScale()); Transform transform = spatiallyNestableOverride->getTransform(success);
return transform; if (success) {
} else { transform.setScale(getScale());
Transform transform; return transform;
transform.setScale(getScale()); }
transform.setTranslation(getTranslation());
transform.setRotation(getRotation());
return transform;
} }
Transform transform;
transform.setScale(getScale());
transform.setTranslation(getTranslation());
transform.setRotation(getRotation());
return transform;
} }
void Model::setScale(const glm::vec3& scale) { void Model::setScale(const glm::vec3& scale) {