Changed 3d texture to default to an empty texture. The redX was
silly (not meaningful in 3d texture) and one day should be changed
to e.g. an "edge" initialiser.
Fixed minor conflict.
Merge branch 'master' of https://github.com/mivp/s2plot

Conflicts:
	src/s2plot.c