diff --git a/libraries/render-utils/src/ToneMappingEffect.cpp b/libraries/render-utils/src/ToneMappingEffect.cpp
index 22c31a2459..29e5da6e2a 100644
--- a/libraries/render-utils/src/ToneMappingEffect.cpp
+++ b/libraries/render-utils/src/ToneMappingEffect.cpp
@@ -36,18 +36,28 @@ void ToneMappingEffect::init() {
         //  Distributed under the Apache License, Version 2.0.
         //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
         //
-        
+
         struct ToneMappingParams {
             vec4 _exp_2powExp_s0_s1;
+            ivec4 _toneCurve_s0_s1_s2;
         };
 
+        const float INV_GAMMA_22 = 1.0 / 2.2;
+        const int ToneCurveNone = 0;
+        const int ToneCurveGamma22 = 1;
+        const int ToneCurveReinhard = 2;
+        const int ToneCurveFilmic = 3;
+
         uniform toneMappingParamsBuffer {
             ToneMappingParams params;
         };
         float getTwoPowExposure() {
             return params._exp_2powExp_s0_s1.y;
         }
-        
+        int getToneCurve() {
+            return params._toneCurve_s0_s1_s2.x;
+        }
+
         uniform sampler2D colorMap;
         
         in vec2 varTexCoord0;
@@ -56,25 +66,26 @@ void ToneMappingEffect::init() {
         void main(void) {
             vec4 fragColorRaw = textureLod(colorMap, varTexCoord0, 0);
             vec3 fragColor = fragColorRaw.xyz;
-
-/*            vec4 fragColorAverage = textureLod(colorMap, varTexCoord0, 10);
+/*
+           vec4 fragColorAverage = textureLod(colorMap, varTexCoord0, 10);
             float averageIntensity = length(fragColorAverage.xyz);
-
-            vec3 fragColor = fragColorRaw.xyz / averageIntensity;
+            fragColor /= averageIntensity;
 */
-            fragColor *= getTwoPowExposure();
+            vec3 srcColor = fragColor * getTwoPowExposure();
 
+            int toneCurve = getToneCurve();
+            vec3 tonedColor = srcColor;
+            if (toneCurve == ToneCurveFilmic) {
+                vec3 x = max(vec3(0.0), srcColor-0.004);
+                tonedColor = (x * (6.2 * x + 0.5)) / (x * (6.2 * x + 1.7) + 0.06);
+            } else if (toneCurve == ToneCurveReinhard) {
+                tonedColor = srcColor/(1.0 + srcColor);
+                tonedColor = pow(tonedColor, vec3(INV_GAMMA_22));
+            } else if (toneCurve == ToneCurveGamma22) {
+                tonedColor = pow(srcColor, vec3(INV_GAMMA_22));
+            } // else None toned = src
 
-            // Manually gamma correct from Ligthing BUffer to color buffer
-            // outFragColor.xyz = pow( fragColor.xyz , vec3(1.0 / 2.2) );
-
-            vec3 x = max(vec3(0.0),fragColor.xyz-0.004);
-            vec3 retColor = (x*(6.2*x+.5))/(x*(6.2*x+1.7)+0.06);
-
-            // fragColor = fragColor/(1.0+fragColor);
-            // vec3 retColor = pow(fragColor.xyz,vec3(1/2.2));
-
-            outFragColor = vec4(retColor, 1.0);
+            outFragColor = vec4(tonedColor, 1.0);
         }
         
         )SCRIBE";
@@ -96,6 +107,9 @@ void ToneMappingEffect::setExposure(float exposure) {
     _parametersBuffer.edit<Parameters>()._twoPowExposure = pow(2.0, exposure);
 }
 
+void ToneMappingEffect::setToneCurve(ToneCurve curve) {
+    _parametersBuffer.edit<Parameters>()._toneCurve = curve;
+}
 
 void ToneMappingEffect::render(RenderArgs* args) {
     if (!_blitLightBuffer) {
diff --git a/libraries/render-utils/src/ToneMappingEffect.h b/libraries/render-utils/src/ToneMappingEffect.h
index be9664ddd9..20ee9024cf 100644
--- a/libraries/render-utils/src/ToneMappingEffect.h
+++ b/libraries/render-utils/src/ToneMappingEffect.h
@@ -30,6 +30,16 @@ public:
     void setExposure(float exposure);
     float getExposure() const { return _parametersBuffer.get<Parameters>()._exposure; }
 
+    // Different tone curve available
+    enum ToneCurve {
+        None = 0,
+        Gamma22,
+        Reinhard,
+        Filmic,
+    };
+    void setToneCurve(ToneCurve curve);
+    ToneCurve getToneCurve() const { return (ToneCurve)_parametersBuffer.get<Parameters>()._toneCurve; }
+
 private:
 
     gpu::PipelinePointer _blitLightBuffer;
@@ -39,7 +49,9 @@ private:
     public:
         float _exposure = 0.0f;
         float _twoPowExposure = 1.0f;
-        glm::vec2 spare;
+        glm::vec2 spareA;
+        int _toneCurve = Filmic;
+        glm::vec3 spareB;
 
         Parameters() {}
     };