am 12fd5db4: Merge "Don\'t clear the functor at every draw" into jb-dev

* commit '12fd5db435043681371ca7e9694744d71b6ba271':
  Don't clear the functor at every draw