Merge branch '139-fix-shaderexecutor-upload-image' into 'master'
authorPyry Haulos <phaulos@google.com>
Tue, 19 Jan 2016 18:51:34 +0000 (13:51 -0500)
committerPyry Haulos <phaulos@google.com>
Tue, 19 Jan 2016 18:51:34 +0000 (13:51 -0500)
commitbcce897648ab39336942e25fbbc15608d8a7d9cf
tree4a7f270c1cbc7c268d3c2f20c7dc68a43e554a9f
parenta56451d82b9ab53d73d8348594b42f2b5e13f568
parent454447f43c1f7bdd0d050e6970f7819f2f878715
Merge branch '139-fix-shaderexecutor-upload-image' into 'master'

ShaderExecutor: use buffer for copying images, fixes #139.

See merge request !350