[Bf-blender-cvs] [6b32de4d9fd] master: Cleanup: Fix build error on windows

Ray Molenkamp noreply at git.blender.org
Fri Oct 2 19:47:49 CEST 2020


Commit: 6b32de4d9fde0bb7d6d257f43a34ece2d56c8ad8
Author: Ray Molenkamp
Date:   Fri Oct 2 11:47:44 2020 -0600
Branches: master
https://developer.blender.org/rB6b32de4d9fde0bb7d6d257f43a34ece2d56c8ad8

Cleanup: Fix build error on windows

int and eContextResult are different types to MSVC
leading to a function signature mismatch.

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

M	source/blender/editors/screen/screen_context.c

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

diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 07a571ae464..74621b917c6 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -987,7 +987,7 @@ static eContextResult screen_ctx_active_editable_fcurve(const bContext *C,
 
 /* Registry of context callback functions. */
 
-typedef int (*context_callback)(const bContext *C, bContextDataResult *result);
+typedef eContextResult (*context_callback)(const bContext *C, bContextDataResult *result);
 static GHash *ed_screen_context_functions = NULL;
 
 static void free_context_function_ghash(void *UNUSED(user_data))



More information about the Bf-blender-cvs mailing list