History

merge from upstream

Seth Alves committed 10 years ago

Commit b7ebe5b2 parents 3402585 6f50d9172 files · +2573 −4128Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 72 files). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+0−5
@@ -247,12 +247,7 @@ void PreferencesDialog::savePreferences() { · 246 unmodified lines
247 myAvatar->setLeanScale(ui.leanScaleSpin->value());247 myAvatar->setLeanScale(ui.leanScaleSpin->value());
248 myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());248 myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());
249 if (myAvatar->getAnimGraphUrl() != ui.avatarAnimationEdit->text()) { // If changed, destroy the old and start with the new249 if (myAvatar->getAnimGraphUrl() != ui.avatarAnimationEdit->text()) { // If changed, destroy the old and start with the new
250 bool isEnabled = myAvatar->getEnableAnimGraph();
251 myAvatar->setEnableAnimGraph(false);
252 myAvatar->setAnimGraphUrl(ui.avatarAnimationEdit->text());250 myAvatar->setAnimGraphUrl(ui.avatarAnimationEdit->text());
253 if (isEnabled) {
254 myAvatar->setEnableAnimGraph(true);
255 }
256 }251 }
257 252
258 myAvatar->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());253 myAvatar->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());