diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:29:21 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:29:21 +0300 |
| commit | 3a4720d1f523ca8ebee0d963604c236c08980eae (patch) | |
| tree | ff5c6adb045d104aa3cce6c6c68e63e3c55659cb /indra/newview/llheroprobemanager.h | |
| parent | 34c13264f33d9bbfc73302b84c8fade1b115fb93 (diff) | |
| parent | 169599fd2f211d66f80a54e13daf975229607022 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FreeType.cmake
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/en/floater_fast_timers.xml
# indra/newview/viewer_manifest.py
# indra/test/test.cpp
Diffstat (limited to 'indra/newview/llheroprobemanager.h')
| -rw-r--r-- | indra/newview/llheroprobemanager.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llheroprobemanager.h b/indra/newview/llheroprobemanager.h index 28852770c3..58a94a3de8 100644 --- a/indra/newview/llheroprobemanager.h +++ b/indra/newview/llheroprobemanager.h @@ -104,8 +104,6 @@ private: // used to generate mipmaps without doing a copy-to-texture LLRenderTarget mRenderTarget; - LLRenderTarget mHeroRenderTarget; - std::vector<LLRenderTarget> mMipChain; // storage for reflection probe radiance maps (plus two scratch space cubemaps) @@ -124,11 +122,6 @@ private: // list of active reflection maps std::vector<LLPointer<LLReflectionMap>> mProbes; - // list of maps being used for rendering - std::vector<LLReflectionMap*> mReflectionMaps; - - LLReflectionMap* mUpdatingProbe = nullptr; - LLPointer<LLReflectionMap> mDefaultProbe; // default reflection probe to fall back to for pixels with no probe influences (should always be at cube index 0) // number of reflection probes to use for rendering |