Added option in casparcg.config to by default enable or disable mipmapping on all...

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 89e707bbb4a3bdd94399d7c59cbb3c2b51ccc074..88cf477d4475095f6557efefc6db4775a210a813 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -72,7 +72,7 @@ public:
                : ogl_(ogl)\r
                , format_desc_(format_desc)\r
        {\r
-               mipmapping_ = false;\r
+               mipmapping_ = env::properties().get(L"configuration.mixer.mipmapping_default_on", false);\r
        }\r
 \r
        void set_mipmapping(bool mipmapping)\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 471bd0bf0a14de3304f13e5afc2ac63a0cbd2300..13397b884feb5ad1c8608c5de38e4c3f31150968 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -30,9 +30,10 @@
 <log-level>       trace [trace|debug|info|warning|error]</log-level>\r
 <channel-grid>    false [true|false]</channel-grid>\r
 <mixer>\r
-    <blend-modes>   false [true|false]</blend-modes>\r
-    <straight-alpha>false [true|false]</straight-alpha>\r
-    <chroma-key>    false [true|false]</chroma-key>\r
+    <blend-modes>          false [true|false]</blend-modes>\r
+    <straight-alpha>       false [true|false]</straight-alpha>\r
+    <chroma-key>           false [true|false]</chroma-key>\r
+    <mipmapping_default_on>false [true|false]</mipmapping_default_on>\r
 </mixer>\r
 <auto-deinterlace>true  [true|false]</auto-deinterlace>\r
 <auto-transcode>  true  [true|false]</auto-transcode>\r