Fixes texture loading.
Merge conflicts.