meh forgot to set a uniform
merging fixes
manually merging