[Bf-blender-cvs] [34c808287e1] blender2.8: Gawain: fix pointer arithmetic warning
Mike Erwin
noreply at git.blender.org
Thu Apr 27 16:02:00 CEST 2017
Commit: 34c808287e17c835c2fca1853046bbcbf66a2e5b
Author: Mike Erwin
Date: Thu Apr 27 09:59:19 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB34c808287e17c835c2fca1853046bbcbf66a2e5b
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.
===================================================================
M intern/gawain/src/immediate.c
===================================================================
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));
More information about the Bf-blender-cvs
mailing list