Merge branch 'master' into OSL_merge
Merge branch 'master' into OSL_merge
Merge branch 'master' into OSL_merge
Adding a ref to OSL's shading system in shading context.
Merge branch 'master' into OSL_merge
Some changes required to execute OSL shaders.
Formatting fixes.
Restored studio settings file.
Fixed PR comments.
Merge pull request #297 from est77/OSL_merge

OSL merge 6