update spanish traslation to reflect new materials feature options
Merge remote-tracking branch 'Liru/master'
update spanish translations in strings.xml and floater_model_preview.xml files
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
Remove hack for nvidia on osx.
Altered the deferred alpha fragment shader to handle alphamasking when drawing avatar hair/skirts. (Special handling for these two seems weird, considering all other mesh parts are also alphamasked.. It also prevents skirts from casting shadows. Future alteration may be desired.)
Kill a tiny bit of dead code.
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Fix a render issue with Hightlight Transparent

The smoke texture is currently not applied to transparent objects.
This commit tweaks the red alpha overlay as a workaround for that.