From 9621b66b786a546dd7d0f148904a6c789467f6c3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 7 Dec 2015 16:23:06 +0100
Subject: [PATCH] Move field of view setting to Camera section

---
 apps/openmw/mwrender/renderingmanager.cpp | 6 +++---
 files/mygui/openmw_settings_window.layout | 2 +-
 files/settings-default.cfg                | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index e8da27dce..e12f2b0cb 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -207,7 +207,7 @@ namespace MWRender
 
         mNearClip = Settings::Manager::getFloat("near clip", "Camera");
         mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
-        mFieldOfView = Settings::Manager::getFloat("field of view", "General");
+        mFieldOfView = Settings::Manager::getFloat("field of view", "Camera");
         updateProjectionMatrix();
         mStateUpdater->setFogEnd(mViewDistance);
 
@@ -813,9 +813,9 @@ namespace MWRender
     {
         for (Settings::CategorySettingVector::const_iterator it = changed.begin(); it != changed.end(); ++it)
         {
-            if (it->first == "General" && it->second == "field of view")
+            if (it->first == "Camera" && it->second == "field of view")
             {
-                mFieldOfView = Settings::Manager::getFloat("field of view", "General");
+                mFieldOfView = Settings::Manager::getFloat("field of view", "Camera");
                 updateProjectionMatrix();
             }
             else if (it->first == "Camera" && it->second == "viewing distance")
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 22d36de2b..6d2424aa5 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -280,7 +280,7 @@
                             <Property key="Range" value="10000"/>
                             <Property key="Page" value="300"/>
                             <UserString key="SettingType" value="Slider"/>
-                            <UserString key="SettingCategory" value="General"/>
+                            <UserString key="SettingCategory" value="Camera"/>
                             <UserString key="SettingName" value="field of view"/>
                             <UserString key="SettingValueType" value="Float"/>
                             <UserString key="SettingMin" value="30"/>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 7d0292c5b..7ad2e7c1d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -23,6 +23,9 @@ small feature culling = true
 # can dramatically affect performance, see documentation for details.
 viewing distance = 6666.0
 
+# Camera field of view in degrees (e.g. 30.0 to 110.0).
+field of view = 55.0
+
 [Cells]
 
 # Adjacent exterior cells loaded (>0). Caution: this setting can
@@ -99,9 +102,6 @@ show effect duration = false
 # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).
 anisotropy = 4
 
-# Camera field of view in degrees (e.g. 30.0 to 110.0).
-field of view = 55.0
-
 # File format for screenshots.  (jpg, png, tga, and possibly more).
 screenshot format = png