History

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

Andrzej Kapolka committed 12 years ago

Commit 6dc4abd2 parents aae168d 8485a0720 files · +154 −145Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 20 files). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+1−2
@@ -2706,8 +2706,7 @@ void StaticModelRenderer::applyRotation(const glm::quat& rotation) { · 2705 unmodified lines
2706}2706}
2707 2707
2708void StaticModelRenderer::applyScale(float scale) {2708void StaticModelRenderer::applyScale(float scale) {
2709 const float SCALE_MULTIPLIER = 0.0006f;2709 _model->setScale(glm::vec3(scale, scale, scale));
2710 _model->setScale(glm::vec3(scale, scale, scale) * SCALE_MULTIPLIER);
2711}2710}
2712 2711
2713void StaticModelRenderer::applyURL(const QUrl& url) {2712void StaticModelRenderer::applyURL(const QUrl& url) {