fixed remaining conflichs in MOAIShader.cpp