texture back in
comments next to booleans
before merging to master
Merge branch 'master' into addingTexture