Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9380 from sethalves/tablet-ui

Browse source 
avoid filling log with bogus warning
This commit is contained in:
Seth Alves 2017-01-13 12:01:41 -08:00 committed by GitHub
commit 691fb14883
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 {
SpatiallyNestablePointer spatiallyNestableOverride = _spatiallyNestableOverride.lock();
if (spatiallyNestableOverride) {
Transform transform = spatiallyNestableOverride->getTransform();
transform.setScale(getScale());
return transform;
} else {
Transform transform;
transform.setScale(getScale());
transform.setTranslation(getTranslation());
transform.setRotation(getRotation());
return transform;
bool success;
Transform transform = spatiallyNestableOverride->getTransform(success);
if (success) {
transform.setScale(getScale());
return transform;
}
}
Transform transform;
transform.setScale(getScale());
transform.setTranslation(getTranslation());
transform.setRotation(getRotation());
return transform;
}
void Model::setScale(const glm::vec3& scale) {