fixes
Merge branch 'master' of https://github.com/mogonen/Shady-2.5D

Conflicts:
	base.h