Merge "Fix a few style issues in rrShaders.hpp" into nyc-dev am: 716bef7