Commit: 5605db8611d62b67ab773360dbc334644f4f020b
Author: Julian Eisel
Date: Mon Mar 6 02:13:55 2017 +0100
Branches: HMD_viewport
https://developer.blender.org/rB5605db8611d62b67ab773360dbc334644f4f020b
Merge branch 'master' into HMD_viewport
Conflicts:
source/blender/windowmanager/wm.h
===================================================================
===================================================================
diff --cc source/blender/windowmanager/wm.h
index a8e1bb1835,e848535949..a5a4ad850f
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@@ -77,7 -77,8 +77,8 @@@ void wm_autosave_read(bContext *C, stru
void wm_autosave_location(char *filepath);
/* wm_stereo.c */
-void wm_method_draw_stereo3d(const bContext *C, wmWindow *win);
+void wm_method_draw_stereo3d(wmWindow *win);
+ void wm_stereo3d_mouse_offset_apply(wmWindow *win, int *r_mouse_xy);
int wm_stereo3d_set_exec(bContext *C, wmOperator *op);
int wm_stereo3d_set_invoke(bContext *C, wmOperator *op, const wmEvent *event);
void wm_stereo3d_set_draw(bContext *C, wmOperator *op);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
