diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-09-22 09:18:34 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-09-22 09:18:34 -0700 |
| commit | 5d3599f5d155dc112c8f05197c8fc73397084e71 (patch) | |
| tree | 1b67cdb5944a222c1de6de3b974caea78a019762 /indra/llrender/llglslshader.h | |
| parent | 150fba7c5cd24ad9ab343e762bfd15032e6a9462 (diff) | |
| parent | 38d9454cbf30f470a723d912be2080f63ae3fa47 (diff) | |
Merge
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rw-r--r-- | indra/llrender/llglslshader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 75cb6cf757..8e9c29ea4c 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -210,6 +210,8 @@ private: inline GLint getLocationForIndex(S32 index) { + if (!mProgramObject) + return -1; uniforms_index_t::iterator it = mUniform.find(index); if (it == mUniform.end()) return -1; @@ -218,6 +220,8 @@ private: inline GLint getTexChannelForIndex(S32 index) { + if (!mProgramObject) + return -1; uniforms_index_t::iterator it = mTexture.find(index); if (it == mTexture.end()) return -1; |