[Bf-blender-cvs] [bef2aab862b] blender2.8: Gawain: fix crash when drawing batches (e.g., scale manipulator)
Dalai Felinto
noreply at git.blender.org
Fri Apr 14 14:34:12 CEST 2017
Commit: bef2aab862b83eec63ddfae460373aae280934b0
Author: Dalai Felinto
Date: Fri Apr 14 14:19:40 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBbef2aab862b83eec63ddfae460373aae280934b0
Gawain: fix crash when drawing batches (e.g., scale manipulator)
Introduced in b02786ae6b
===================================================================
M intern/gawain/src/batch.c
===================================================================
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)
{
More information about the Bf-blender-cvs
mailing list