Updated texture finding, based on master branch