diff options
| author | Jacek Antonelli | 2008-12-09 22:25:37 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-09 22:25:41 -0600 |
| commit | 22b861982f2efd5d16097a012627e73b9fb85834 (patch) | |
| tree | 6152a84b92c682e271bdd52d46cd1728454f679a /linden/indra/llrender/llrender.cpp | |
| parent | Second Life viewer sources 1.22.1-RC (diff) | |
| download | meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.zip meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.gz meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.bz2 meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.xz | |
Second Life viewer sources 1.22.2-RC
Diffstat (limited to 'linden/indra/llrender/llrender.cpp')
| -rw-r--r-- | linden/indra/llrender/llrender.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp index 80fed06..a15f44a 100644 --- a/linden/indra/llrender/llrender.cpp +++ b/linden/indra/llrender/llrender.cpp | |||
| @@ -190,6 +190,10 @@ bool LLTexUnit::bind(const LLImageGL* texture) | |||
| 190 | { | 190 | { |
| 191 | return texture->bindDefaultImage(mIndex); | 191 | return texture->bindDefaultImage(mIndex); |
| 192 | } | 192 | } |
| 193 | if (!texture->getTexName()) //if texture does not exist | ||
| 194 | { | ||
| 195 | return texture->bindDefaultImage(mIndex); | ||
| 196 | } | ||
| 193 | 197 | ||
| 194 | // Disabled caching of binding state. | 198 | // Disabled caching of binding state. |
| 195 | if (texture != NULL) | 199 | if (texture != NULL) |