Updated the effects settings data so now you only pass in a texture slot, not a texture
Merge branch 'master' into psm