Merge change 20887

* changes:
  option to use drawtexture at compile time