Revert "Revert "Merge""
This reverts commit f690d8f0.
parent
c2b41b07
No related branches found
No related tags found
Showing
- indra/newview/CMakeLists.txt 2 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/llfetchedgltfmaterial.cpp 0 additions, 52 deletionsindra/newview/llfetchedgltfmaterial.cpp
- indra/newview/llfetchedgltfmaterial.h 0 additions, 5 deletionsindra/newview/llfetchedgltfmaterial.h
- indra/newview/llgltfmaterialpreviewmgr.cpp 553 additions, 0 deletionsindra/newview/llgltfmaterialpreviewmgr.cpp
- indra/newview/llgltfmaterialpreviewmgr.h 82 additions, 0 deletionsindra/newview/llgltfmaterialpreviewmgr.h
- indra/newview/lltexturectrl.cpp 67 additions, 26 deletionsindra/newview/lltexturectrl.cpp
- indra/newview/lltexturectrl.h 3 additions, 0 deletionsindra/newview/lltexturectrl.h
- indra/newview/pipeline.cpp 6 additions, 3 deletionsindra/newview/pipeline.cpp
- indra/newview/pipeline.h 1 addition, 0 deletionsindra/newview/pipeline.h
Loading
Please register or sign in to comment