Merge pull request #289 from est77/OSL_merge

OSL merge 1
reuse OIIO's texture system