Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-04-14 15:19:40 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-04-14 15:33:29 +0300
commitbef2aab862b83eec63ddfae460373aae280934b0 (patch)
tree79b40f56aa653a8e5358a4a5c93f6268b0235779 /intern
parent95b36321126fd6f9563b309930ac9ae6cf422a81 (diff)
Gawain: fix crash when drawing batches (e.g., scale manipulator)
Introduced in b02786ae6b
Diffstat (limited to 'intern')
-rw-r--r--intern/gawain/src/batch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/gawain/src/batch.c b/intern/gawain/src/batch.c
index 5de6335e0bb..d4465c7809a 100644
--- a/intern/gawain/src/batch.c
+++ b/intern/gawain/src/batch.c
@@ -14,7 +14,7 @@
#include <stdlib.h>
// necessary functions from matrix API
-extern void gpuBindMatrices(GLuint program);
+extern void gpuBindMatrices(const ShaderInterface* shaderface);
extern bool gpuMatricesDirty(void); // how best to use this here?
Batch* Batch_create(PrimitiveType prim_type, VertexBuffer* verts, ElementList* elem)
@@ -262,7 +262,7 @@ void Batch_draw(Batch* batch)
Batch_use_program(batch);
- gpuBindMatrices(batch->program);
+ gpuBindMatrices(batch->interface);
if (batch->elem)
{