Cleaned texture uploaders to keep them in the same pattern as texture updaters.
Merge remote-tracking branch 'upstream/master'