[Bf-blender-cvs] [9145c69] master: Revert "Fix compile error in gpu_debug (incompatible-pointer-type)."

Campbell Barton noreply at git.blender.org
Sun Jan 17 03:33:09 CET 2016


Commit: 9145c6976cc1e9347b6329809ca9f9f9e3f3d156
Author: Campbell Barton
Date:   Sun Jan 17 13:19:14 2016 +1100
Branches: master
https://developer.blender.org/rB9145c6976cc1e9347b6329809ca9f9f9e3f3d156

Revert "Fix compile error in gpu_debug (incompatible-pointer-type)."

This reverts commit 75cfc81ec39ac9953f25eb0ae5f9e70d3c24ee7e.

===================================================================

M	source/blender/gpu/intern/gpu_debug.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c
index c98b304..da20826 100644
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -162,7 +162,7 @@ const char *gpuErrorString(GLenum err)
 static void APIENTRY gpu_debug_proc(
         GLenum source, GLenum type, GLuint UNUSED(id),
         GLenum UNUSED(severity), GLsizei UNUSED(length),
-        const GLchar *message, GLvoid *UNUSED(userParm))
+        const GLchar *message, const GLvoid *UNUSED(userParm))
 {
 	if (source == GL_DEBUG_SOURCE_API && type == GL_DEBUG_TYPE_ERROR) {
 		fprintf(stderr, "GL: %s\n", message);




More information about the Bf-blender-cvs mailing list