opengl.textures: fix merge whoops.
opengl.textures: fix merge whoops.

slavapestov/factor,bpollack/factor,bjourne/factor,AlexIljin/factor,AlexIljin/factor,AlexIljin/factor,bjourne/factor,mrjbq7/factor,bjourne/factor,slavapestov/factor,nicolas-p/factor,nicolas-p/factor,nicolas-p/factor,bpollack/factor,mrjbq7/factor,tgunr/factor,bpollack/factor,AlexIljin/factor,slavapestov/factor,mrjbq7/factor,bjourne/factor,nicolas-p/factor,tgunr/factor,tgunr/factor,bjourne/factor,bjourne/factor,factor/factor,tgunr/factor,slavapestov/factor,bpollack/factor,slavapestov/factor,factor/factor,slavapestov/factor,bpollack/factor,factor/factor,factor/factor,mrjbq7/factor,mrjbq7/factor,AlexIljin/factor,bjourne/factor,nicolas-p/factor,AlexIljin/factor,mrjbq7/factor,nicolas-p/factor,AlexIljin/factor,nicolas-p/factor,tgunr/factor,slavapestov/factor,bpollack/factor,tgunr/factor,bpollack/factor,factor/factor,factor/factor