From ea8edb3744c2931f69d52970779216ad20d86879 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 23 Feb 2016 16:18:27 -0800
Subject: [PATCH] Remove antialiasing from menus, default to on

---
 interface/resources/config/render.json          | 5 -----
 interface/src/ui/PreferencesDialog.cpp          | 9 ---------
 libraries/render-utils/src/AntialiasingEffect.h | 4 ++--
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/interface/resources/config/render.json b/interface/resources/config/render.json
index 092530d864..414d94e11e 100644
--- a/interface/resources/config/render.json
+++ b/interface/resources/config/render.json
@@ -9,11 +9,6 @@
             "Enabled": {
                 "enabled": true
             }
-        },
-        "Antialiasing": {
-            "Enabled": {
-                "enabled": true
-            }
         }
     }
 }
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 93bacdd402..78c2405ade 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -330,15 +330,6 @@ void setupPreferences() {
             preferences->addPreference(preference);
         }
 
-        auto antialiasingConfig = renderConfig->getConfig<Antialiasing>();
-        {
-            auto getter = [antialiasingConfig]()->QString { return antialiasingConfig->getPreset(); };
-            auto setter = [antialiasingConfig](QString preset) { antialiasingConfig->setPreset(preset); };
-            auto preference = new ComboBoxPreference(RENDER, "Antialiasing", getter, setter);
-            preference->setItems(antialiasingConfig->getPresetList());
-            preferences->addPreference(preference);
-        }
-
         auto shadowConfig = renderConfig->getConfig<RenderShadowTask>();
         {
             auto getter = [shadowConfig]()->QString { return shadowConfig->getPreset(); };
diff --git a/libraries/render-utils/src/AntialiasingEffect.h b/libraries/render-utils/src/AntialiasingEffect.h
index 6185ed07dc..6386622675 100644
--- a/libraries/render-utils/src/AntialiasingEffect.h
+++ b/libraries/render-utils/src/AntialiasingEffect.h
@@ -16,11 +16,11 @@
 
 #include "render/DrawTask.h"
 
-class AntiAliasingConfig : public render::Job::Config::Persistent {
+class AntiAliasingConfig : public render::Job::Config {
     Q_OBJECT
     Q_PROPERTY(bool enabled MEMBER enabled)
 public:
-    AntiAliasingConfig() : render::Job::Config::Persistent("Antialiasing", false) {}
+    AntiAliasingConfig() : render::Job::Config(true) {}
 };
 
 class Antialiasing {