[Bf-blender-cvs] [d042962] master: Cleanup some warnings

[Sergey Sharybin]

Commit: d0429620253e47f89e2f9b8ae101d5d00e7676c6
Author: Sergey Sharybin
Date:   Tue Mar 15 14:16:16 2016 +0500
Branches: master
https://developer.blender.org/rBd0429620253e47f89e2f9b8ae101d5d00e7676c6

Cleanup some warnings

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

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

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

diff --git a/source/blender/bmesh/intern/bmesh_walkers.c 
b/source/blender/bmesh/intern/bmesh_walkers.c
index d16eb57..d39fb38 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.c
+++ b/source/blender/bmesh/intern/bmesh_walkers.c
@@ -96,7 +96,7 @@ void BMW_init(
        if (UNLIKELY(type >= BMW_MAXWALKERS || type < 0)) {
                fprintf(stderr,
                        "%s: Invalid walker type in BMW_init; type: %d, "
-                       "searchmask: (v:%d, e:%d, f:%d), flag: %d, layer: %d\n",
+                       "searchmask: (v:%d, e:%d, f:%d), flag: %u, layer: %d\n",
                        __func__, type, mask_vert, mask_edge, mask_face, flag, 
layer);
                BLI_assert(0);
                return;
diff --git a/source/blender/gpu/intern/gpu_debug.c 
b/source/blender/gpu/intern/gpu_debug.c
index da20826..be92857 100644
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -195,7 +195,7 @@ void gpu_debug_init(void)
 #if !defined(WITH_GLEW_ES) && !defined(GLEW_ES_ONLY)
        if (GLEW_VERSION_4_3) {
                glEnable(GL_DEBUG_OUTPUT);
-               glDebugMessageCallback(gpu_debug_proc, mxGetCurrentContext());
+               glDebugMessageCallback((GLDEBUGPROC)gpu_debug_proc, 
mxGetCurrentContext());
                glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 
0, NULL, GL_TRUE);
                GPU_string_marker(sizeof(success), success);
                return;
@@ -204,7 +204,7 @@ void gpu_debug_init(void)
 
        if (GLEW_KHR_debug) {
 #ifndef GLEW_ES_ONLY
-               glDebugMessageCallback(gpu_debug_proc, mxGetCurrentContext());
+               glDebugMessageCallback((GLDEBUGPROC)gpu_debug_proc, 
mxGetCurrentContext());
                glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 
0, NULL, GL_TRUE);
                GPU_string_marker(sizeof(success), success);
 #endif
@@ -213,7 +213,7 @@ void gpu_debug_init(void)
 
 #ifndef GLEW_ES_ONLY
        if (GLEW_ARB_debug_output) {
-               glDebugMessageCallbackARB(gpu_debug_proc, 
mxGetCurrentContext());
+               glDebugMessageCallbackARB((GLDEBUGPROCARB)gpu_debug_proc, 
mxGetCurrentContext());
                glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, 
GL_DONT_CARE, 0, NULL, GL_TRUE);
                GPU_string_marker(sizeof(success), success);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs