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

Merge branch 'master' of github.com:highfidelity/hifi into polyvox

Browse source
This commit is contained in:
Seth Alves 2015-06-16 09:32:53 -07:00
commit e98b28c1d8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1761,7 +1761,7 @@ void Model::setupBatchTransform(gpu::Batch& batch, RenderArgs* args) {
}
AABox Model::getPartBounds(int meshIndex, int partIndex) {
if (!_calculatedMeshPartBoxesValid) {
if (!_calculatedMeshPartBoxesValid || !_calculatedMeshBoxesValid) {
recalculateMeshBoxes(true);
}
@ -1802,7 +1802,7 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, bool tran
// we always need these properly calculated before we can render, this will likely already have been done
// since the engine will call our getPartBounds() before rendering us.
if (!_calculatedMeshPartBoxesValid) {
if (!_calculatedMeshPartBoxesValid || !_calculatedMeshBoxesValid) {
recalculateMeshBoxes(true);
}
auto textureCache = DependencyManager::get<TextureCache>();