diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-11-06 06:52:24 +0000 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-11-06 06:52:24 +0000 |
| commit | 35e200881c38eb6c1bfd1f14ef440d4bc4da8c74 (patch) | |
| tree | 8fceb759ef8f8259fd574c398ac02965566a05ff /indra/llrender/llrender.h | |
| parent | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (diff) | |
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
Diffstat (limited to 'indra/llrender/llrender.h')
| -rw-r--r-- | indra/llrender/llrender.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index cb2a4d4450..0121a190ee 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -149,8 +149,8 @@ public: // Binds the LLImageGL to this texture unit // (automatically enables the unit for the LLImageGL's texture type) - bool bind(LLImageGL* texture, bool forceBind = false); - bool bind(LLTexture* texture, bool forceBind = false); + bool bind(LLImageGL* texture, bool for_rendering = false, bool forceBind = false); + bool bind(LLTexture* texture, bool for_rendering = false, bool forceBind = false); // Binds a cubemap to this texture unit // (automatically enables the texture unit for cubemaps) |