Showing the changes to interface/src/Application.cpp (1 of 61 files). Show all
Unified · Split
| @@ -2790,8 +2790,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 2789 unmodified lines | ||
| 2790 | 2790 | if (!selfAvatarOnly) { |
| 2791 | 2791 | // draw a red sphere |
| 2792 | 2792 | float originSphereRadius = 0.05f; |
| 2793 | − glColor3f(1,0,0); | |
| 2794 | − DependencyManager::get<GeometryCache>()->renderSphere(originSphereRadius, 15, 15); | |
| 2793 | + DependencyManager::get<GeometryCache>()->renderSphere(originSphereRadius, 15, 15, glm::vec4(1.0f, 0.0f, 0.0f, 1.0f)); | |
| 2795 | 2794 | |
| 2796 | 2795 | // also, metavoxels |
| 2797 | 2796 | if (Menu::getInstance()->isOptionChecked(MenuOption::Metavoxels)) { |
| @@ -3398,8 +3397,10 @@ void Application::loadScripts() { · 600 unmodified lines | ||
| 3398 | 3397 | } |
| 3399 | 3398 | |
| 3400 | 3399 | void Application::clearScriptsBeforeRunning() { |
| 3401 | − // clears all scripts from the settings | |
| 3402 | − SettingHandles::SettingHandle<QVariant>(SETTINGS_KEY).remove(); | |
| 3400 | + // clears all scripts from the settingsSettings settings; | |
| 3401 | + Settings settings; | |
| 3402 | + settings.beginWriteArray(SETTINGS_KEY); | |
| 3403 | + settings.remove(""); | |
| 3403 | 3404 | } |
| 3404 | 3405 | |
| 3405 | 3406 | void Application::saveScripts() { |
| @@ -3411,6 +3412,7 @@ void Application::saveScripts() { · 5 unmodified lines | ||
| 3411 | 3412 | // Saves all currently running user-loaded scripts |
| 3412 | 3413 | Settings settings; |
| 3413 | 3414 | settings.beginWriteArray(SETTINGS_KEY); |
| 3415 | + settings.remove(""); | |
| 3414 | 3416 | int i = 0; |
| 3415 | 3417 | for (auto it = runningScripts.begin(); it != runningScripts.end(); ++it) { |
| 3416 | 3418 | if (getScriptEngine(*it)->isUserLoaded()) { |