Commit: 3a969f52ee39dd9bcbb2d3b6565cb3d1c6816056
Author: Antony Riakiotakis
Date: Fri Jun 27 21:16:21 2014 +0300
https://developer.blender.org/rB3a969f52ee39dd9bcbb2d3b6565cb3d1c6816056
Fix blenderplayer compilation, fire timer for pie timeout in 100ths of
second.
===================================================================
M source/blender/windowmanager/intern/wm_operators.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index bb2c0f8..2fb1949 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2086,7 +2086,7 @@ static int wm_call_pie_menu_timer_invoke(bContext *C,
wmOperator *op, const wmEv
wmWindow *win = CTX_wm_window(C);
PieTimerData *data = MEM_callocN(sizeof(PieTimerData), "pie timer");
- data->timer = WM_event_add_timer(wm, win, TIMER, 0.05);
+ data->timer = WM_event_add_timer(wm, win, TIMER, 0.01);
/* copy event, it will be used to spawn pie menu */
data->event = *event;
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c
b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 0033aaa..5fc4de9 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -620,8 +620,8 @@ struct uiPopupMenu *uiPupMenuBegin(struct bContext *C,
const char *title, int ic
void uiPupMenuEnd(struct bContext *C, struct uiPopupMenu *head) RET_NONE
struct uiLayout *uiPupMenuLayout(struct uiPopupMenu *head) RET_NULL
struct uiLayout *uiPieMenuLayout(struct uiPieMenu *pie) RET_NULL
-void uiPieMenuInvoke(struct bContext *C, const char *idname, short event)
RET_NONE
-struct uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int
icon, short event) RET_NULL
+void uiPieMenuInvoke(struct bContext *C, const char *idname, const struct
wmEvent *event) RET_NONE
+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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
