fix merge
Changes to windows
Mostly working shader
merged texture fix