[Bf-blender-cvs] [d5f1f66] master: typo in last commit
Campbell Barton
noreply at git.blender.org
Tue Sep 8 15:52:18 CEST 2015
Commit: d5f1f66f06152e7bb881bbb6387e3dc01fce4326
Author: Campbell Barton
Date: Tue Sep 8 23:46:56 2015 +1000
Branches: master
https://developer.blender.org/rBd5f1f66f06152e7bb881bbb6387e3dc01fce4326
typo in last commit
===================================================================
M source/blender/editors/space_view3d/view3d_walk.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c
index 8bb1020..0bda6e3 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@ -585,7 +585,7 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op)
walk->center_mval[0] += walk->ar->winrct.xmin;
walk->center_mval[1] += walk->ar->winrct.ymin;
- WM_cursor_comaptible_xy(win, &walk->center_mval[0], &walk->center_mval[1]);
+ WM_cursor_compatible_xy(win, &walk->center_mval[0], &walk->center_mval[1]);
walk->center_mval[0] -= walk->ar->winrct.xmin;
walk->center_mval[1] -= walk->ar->winrct.ymin;
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index a21886c..abbbe75 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -130,7 +130,7 @@ void WM_paint_cursor_end(struct wmWindowManager *wm, void *handle);
void WM_paint_cursor_tag_redraw(struct wmWindow *win, struct ARegion *ar);
void WM_cursor_warp (struct wmWindow *win, int x, int y);
-void WM_cursor_comaptible_xy(wmWindow *win, int *x, int *y);
+void WM_cursor_compatible_xy(wmWindow *win, int *x, int *y);
float WM_cursor_pressure (const struct wmWindow *win);
/* event map */
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index c2209b2..8b7780b 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1559,7 +1559,7 @@ void WM_cursor_warp(wmWindow *win, int x, int y)
/**
* Set x, y to values we can actually position the cursor to.
*/
-void WM_cursor_comaptible_xy(wmWindow *win, int *x, int *y)
+void WM_cursor_compatible_xy(wmWindow *win, int *x, int *y)
{
float f = GHOST_GetNativePixelSize(win->ghostwin);
if (f != 1.0f) {
More information about the Bf-blender-cvs
mailing list