Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'singu/master' into curlthreading2

Browse Source 
Conflicts:
	indra/newview/statemachine/aistatemachine.cpp

Huh - you re-INDENTED a file that you didn't merge yet?
How about merging curlthreading2 and curlthreading3
before doing THAT? :/

Obviously I did an "use ours" here.
This commit is contained in:
Aleric Inglewood
2012-09-11 15:15:46 +02:00
parent d57a3b101b 4ade726a07
commit d23835a6c2
35 changed files with 406 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl
View File

@@ -23,9 +23,9 @@
* $/LicenseInfo$
*/
ATTRIBUTE int texture_index;
ATTRIBUTE ivec4 texture_index;
VARYING_FLAT int vary_texture_index;
VARYING_FLAT ivec4 vary_texture_index;
void passTextureIndex()
{