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
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-04-27 16:59:19 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-27 16:59:19 +0300
commit34c808287e17c835c2fca1853046bbcbf66a2e5b (patch)
treefaf7fa3abd704e8ff71642b350d4b7d917d4168d
parent9a193a28c4fc3be4883f0fa778ab0327e699b067 (diff)
Gawain: fix pointer arithmetic warning
void* + offset = ??? This Mac-only code works, but wasn't strictly correct. clang doesn't warn about this, gcc does.
-rw-r--r--intern/gawain/src/immediate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c
index 9265d30e083..0cf24668b10 100644
--- a/intern/gawain/src/immediate.c
+++ b/intern/gawain/src/immediate.c
@@ -222,7 +222,7 @@ void immBegin(PrimitiveType prim_type, unsigned vertex_ct)
// printf("mapping %u to %u\n", imm.buffer_offset, imm.buffer_offset + bytes_needed - 1);
#if APPLE_LEGACY
- imm.buffer_data = glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY) + imm.buffer_offset;
+ imm.buffer_data = (GLubyte*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY) + imm.buffer_offset;
#else
imm.buffer_data = glMapBufferRange(GL_ARRAY_BUFFER, imm.buffer_offset, bytes_needed,
GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | (imm.strict_vertex_ct ? 0 : GL_MAP_FLUSH_EXPLICIT_BIT));