Merge pull request #1930 from rextimmy/texture_crash