Merge pull request #1774 from secondlife/marchcat/b-merge

Release (Materials featurette) -> Maint B sync

1 files changed, 0 insertions, 24 deletions

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 1073db3bfd..b92c9363fc 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -2068,10 +2068,6 @@ void LLRender::diffuseColor3f(F32 r, F32 g, F32 b)
     {
         shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, r,g,b,1.f);
     }
-    else
-    {
-        glColor3f(r,g,b);
-    }
 }
 
 void LLRender::diffuseColor3fv(const F32* c)
@@ -2083,10 +2079,6 @@ void LLRender::diffuseColor3fv(const F32* c)
     {
         shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, c[0], c[1], c[2], 1.f);
     }
-    else
-    {
-        glColor3fv(c);
-    }
 }
 
 void LLRender::diffuseColor4f(F32 r, F32 g, F32 b, F32 a)
@@ -2098,10 +2090,6 @@ void LLRender::diffuseColor4f(F32 r, F32 g, F32 b, F32 a)
     {
         shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, r,g,b,a);
     }
-    else
-    {
-        glColor4f(r,g,b,a);
-    }
 }
 
 void LLRender::diffuseColor4fv(const F32* c)
@@ -2113,10 +2101,6 @@ void LLRender::diffuseColor4fv(const F32* c)
     {
         shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, c);
     }
-    else
-    {
-        glColor4fv(c);
-    }
 }
 
 void LLRender::diffuseColor4ubv(const U8* c)
@@ -2128,10 +2112,6 @@ void LLRender::diffuseColor4ubv(const U8* c)
     {
         shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, c[0]/255.f, c[1]/255.f, c[2]/255.f, c[3]/255.f);
     }
-    else
-    {
-        glColor4ubv(c);
-    }
 }
 
 void LLRender::diffuseColor4ub(U8 r, U8 g, U8 b, U8 a)
@@ -2143,10 +2123,6 @@ void LLRender::diffuseColor4ub(U8 r, U8 g, U8 b, U8 a)
     {
         shader->uniform4f(LLShaderMgr::DIFFUSE_COLOR, r/255.f, g/255.f, b/255.f, a/255.f);
     }
-    else
-    {
-        glColor4ub(r,g,b,a);
-    }
 }