reuse OIIO's texture system
Merge branch 'master' into OSL_merge
Formatting fixes
Pass OSL's shading system to the scene's on_frame_begin / end
Removed oslexec include
fixed OSL ifdefs indentation
fixed indentation
Merge pull request #290 from est77/OSL_merge

OSL merge 2