Merging in file-move-merge ( QAR-649 )
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h
Showing
- indra/cmake/LLRender.cmake 21 additions, 0 deletionsindra/cmake/LLRender.cmake
- indra/llrender/CMakeLists.txt 34 additions, 0 deletionsindra/llrender/CMakeLists.txt
- indra/llrender/llcubemap.cpp 532 additions, 0 deletionsindra/llrender/llcubemap.cpp
- indra/llrender/llcubemap.h 89 additions, 0 deletionsindra/llrender/llcubemap.h
- indra/llrender/llgl.cpp 1726 additions, 0 deletionsindra/llrender/llgl.cpp
- indra/llrender/llgl.h 377 additions, 0 deletionsindra/llrender/llgl.h
- indra/llrender/llglheaders.h 588 additions, 0 deletionsindra/llrender/llglheaders.h
- indra/llrender/llglslshader.cpp 823 additions, 0 deletionsindra/llrender/llglslshader.cpp
- indra/llrender/llglslshader.h 139 additions, 0 deletionsindra/llrender/llglslshader.h
- indra/llrender/llglstates.h 302 additions, 0 deletionsindra/llrender/llglstates.h
- indra/llrender/llgltypes.h 44 additions, 0 deletionsindra/llrender/llgltypes.h
- indra/llrender/llpostprocess.cpp 574 additions, 0 deletionsindra/llrender/llpostprocess.cpp
- indra/llrender/llpostprocess.h 268 additions, 0 deletionsindra/llrender/llpostprocess.h
- indra/llrender/llrender.cpp 6 additions, 0 deletionsindra/llrender/llrender.cpp
- indra/llrender/llrender.h 4 additions, 1 deletionindra/llrender/llrender.h
- indra/llrender/llrendersphere.cpp 159 additions, 0 deletionsindra/llrender/llrendersphere.cpp
- indra/llrender/llrendersphere.h 34 additions, 0 deletionsindra/llrender/llrendersphere.h
- indra/llrender/llshadermgr.cpp 513 additions, 0 deletionsindra/llrender/llshadermgr.cpp
- indra/llrender/llshadermgr.h 75 additions, 0 deletionsindra/llrender/llshadermgr.h
- indra/llrender/llvertexbuffer.h 1 addition, 0 deletionsindra/llrender/llvertexbuffer.h
Loading
Please register or sign in to comment