Merge pull request #290 from est77/OSL_merge

OSL merge 2
fixed multiple build problems when WITH_OSL is undefined; fixed coding style issues.
Made render related methods non-const
Pass OSL's shading system to assemblies. Other small fixes.