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

Merge branch 'master' of http://github.com/worklist/hifi into few_avatar_resizing_correction

Browse source
This commit is contained in:
atlante45 2013-07-16 12:05:11 -07:00
commit b10c395440
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Avatar.cpp
View file

@ -1322,6 +1322,10 @@ void Avatar::loadData(QSettings* settings) {
_leanScale = loadSetting(settings, "leanScale", 0.5f); _leanScale = loadSetting(settings, "leanScale", 0.5f);
_scale = loadSetting(settings, "scale", 1.0f);
setScale(_scale);
Application::getInstance()->getCamera()->setScale(_scale);
settings->endGroup(); settings->endGroup();
} }
@ -1344,6 +1348,7 @@ void Avatar::saveData(QSettings* set) {
set->setValue("voxelURL", _voxels.getVoxelURL()); set->setValue("voxelURL", _voxels.getVoxelURL());
set->setValue("leanScale", _leanScale); set->setValue("leanScale", _leanScale);
set->setValue("scale", _scale);
set->endGroup(); set->endGroup();
} }