diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-13 16:11:22 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-13 16:11:22 -0500 |
| commit | c0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (patch) | |
| tree | 69bed5c3a72357e183384917b5495c2990e1ac13 /indra/newview/llwlparamset.cpp | |
| parent | 19371a9abed3198f9f6083c3b2483e65778e944a (diff) | |
| parent | 38c19f4e55c0f6a104de87dfb57313a6c529b4d6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
| -rw-r--r-- | indra/newview/llwlparamset.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index 02d914a812..22fba90f65 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -91,8 +91,9 @@ void LLWLParamSet::update(LLGLSLShader * shader) const val.mV[1] = F32(i->second[1].asReal()) + mCloudScrollYOffset; val.mV[2] = (F32) i->second[2].asReal(); val.mV[3] = (F32) i->second[3].asReal(); - - shader->uniform4fv(param, 1, val.mV); + stop_glerror(); + shader->uniform4fv(param, 1, val.mV); + stop_glerror(); } else // param is the uniform name { @@ -118,8 +119,9 @@ void LLWLParamSet::update(LLGLSLShader * shader) const { val.mV[0] = i->second.asBoolean(); } - + stop_glerror(); shader->uniform4fv(param, 1, val.mV); + stop_glerror(); } } } |