From: Jesper Stærkær <jesper@starkar.no>
Date: Fri, 25 Nov 2016 17:30:30 +0000 (+0100)
Subject: changed the casing of the config-parameter mipmapping_default_on to mipmapping-defaul... 
X-Git-Tag: 2.1.0_Beta2~135^2
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f10fa2af649fb240ce93ebbd329558f8713577dc;p=casparcg

changed the casing of the config-parameter mipmapping_default_on to mipmapping-default-on, fixing CasparCG/Server#508
---

diff --git a/core/frame/frame_transform.h b/core/frame/frame_transform.h
index bf2cdb35f..e21e17fb2 100644
--- a/core/frame/frame_transform.h
+++ b/core/frame/frame_transform.h
@@ -154,7 +154,7 @@ public:
 		: duration_(0)
 		, time_(0)
 	{
-		dest_.image_transform.use_mipmap = env::properties().get(L"configuration.mixer.mipmapping_default_on", false);
+		dest_.image_transform.use_mipmap = env::properties().get(L"configuration.mixer.mipmapping-default-on", false);
 	}
 
 	tweened_transform(const frame_transform& source, const frame_transform& dest, int duration, const tweener& tween)
diff --git a/shell/casparcg.config b/shell/casparcg.config
index d9973b14a..173442485 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -41,7 +41,7 @@
 <channel-grid>        false [true|false]</channel-grid>
 <mixer>
     <blend-modes>          false [true|false]</blend-modes>
-    <mipmapping_default_on>false [true|false]</mipmapping_default_on>
+    <mipmapping-default-on>false [true|false]</mipmapping-default-on>
     <straight-alpha>       false [true|false]</straight-alpha>
 </mixer>
 <accelerator>auto [cpu|gpu|auto]</accelerator>