mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

solve merge conflict in kameleonplane

Browse Source
This commit is contained in:
Michael Nilsson
2016-06-03 09:20:27 -04:00
parent c05b417519 e1b042b252
commit e694be248f
16 changed files with 159 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/datacygnet.cpp
+1 -4
View File
@@ -144,11 +144,8 @@ void DataCygnet::setTextureUniforms(){
}
}
//Set Transfer Functions
if(activeTextures > 0){
if(selectedOptions.back()>=activeTransferfunctions)
if(activeTextures > 0 && selectedOptions.back()>=(int)_transferFunctions.size())
activeTransferfunctions = 1;
}
ghoul::opengl::TextureUnit tfUnits[MAX_TEXTURES];
j = 0;