[Bf-blender-cvs] [4852936] master: Player: fix conflicting type introduced in 2f0bdcb306999

Jens Verwiebe noreply at git.blender.org
Tue Oct 28 21:40:14 CET 2014


Commit: 485293647ff1a054da6821b09d567ee94a63a7a8
Author: Jens Verwiebe
Date:   Tue Oct 28 21:39:54 2014 +0100
Branches: master
https://developer.blender.org/rB485293647ff1a054da6821b09d567ee94a63a7a8

Player: fix conflicting type introduced in 2f0bdcb306999

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

M	source/blenderplayer/bad_level_call_stubs/stubs.c

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

diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 51f30b8..25830fb 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -630,7 +630,7 @@ int uiPieMenuInvoke(struct bContext *C, const char *idname, const struct wmEvent
 struct uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon, const struct wmEvent *event) RET_NULL
 void uiPieMenuEnd(struct bContext *C, uiPieMenu *pie) RET_NONE
 struct uiLayout *uiLayoutRadial(struct uiLayout *layout) RET_NULL
-void uiPieOperatorEnumInvoke(struct bContext *C, const char *title, const char *opname,
+int uiPieOperatorEnumInvoke(struct bContext *C, const char *title, const char *opname,
                              const char *propname, const struct wmEvent *event) RET_NONE
 
 /* RNA COLLADA dependency */




More information about the Bf-blender-cvs mailing list