Adds Hotspot control to custom cursor.

5 files changed, 8 insertions, 6 deletions

diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c
index 7b5cba2927b..1525c69125a 100644
--- a/source/blender/src/editmesh.c
+++ b/source/blender/src/editmesh.c
@@ -7376,7 +7376,7 @@ void KnifeSubdivide(char mode){
 	oldcursor=get_cursor();
 	//set_cursor(CURSOR_PENCIL); 
 	win=winlay_get_active_window();
-	window_set_custom_cursor(win, mask, bitmap);
+	window_set_custom_cursor(win, mask, bitmap, 0, 15);
 	//GHOST_SetCustomCursorShape(win->ghostwin, mask, bitmap, 0, 15);
 	
 	curve=get_mouse_trail(&len, TRAIL_MIXED);
diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c
index 10fdf34e455..cdf542f6dd4 100644
--- a/source/blender/src/editscreen.c
+++ b/source/blender/src/editscreen.c
@@ -3068,7 +3068,7 @@ void set_timecursor(int nr)
 	}
 
 	curcursor= CURSOR_NONE;
-	window_set_custom_cursor(mainwin, mask, bitmap);
+	window_set_custom_cursor(mainwin, mask, bitmap, 7, 7);
 	BIF_renderwin_set_custom_cursor(mask, bitmap);
 }
 
diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c
index 38df9ead5e0..33ddf13cd1a 100644
--- a/source/blender/src/ghostwinlay.c
+++ b/source/blender/src/ghostwinlay.c
@@ -326,8 +326,9 @@ void window_set_cursor(Window *win, int curs) {
 	}
 }
 
-void window_set_custom_cursor(Window *win, unsigned char mask[16][2], unsigned char bitmap[16][2]) {
-	GHOST_SetCustomCursorShape(win->ghostwin, bitmap, mask, 7, 7);
+void window_set_custom_cursor(Window *win, unsigned char mask[16][2], 
+					unsigned char bitmap[16][2], int hotx, int hoty) {
+	GHOST_SetCustomCursorShape(win->ghostwin, bitmap, mask, hotx, hoty);
 }
 
 void window_make_active(Window *win) {
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 5c7aefc7e63..bdb60084b98 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -985,6 +985,6 @@ void BIF_toggle_render_display(void)
 void BIF_renderwin_set_custom_cursor(unsigned char mask[16][2], unsigned char bitmap[16][2])
 {
 	if (render_win) {
-		window_set_custom_cursor(render_win->win, mask, bitmap);
+		window_set_custom_cursor(render_win->win, mask, bitmap, 7, 7);
 	}
 }
diff --git a/source/blender/src/winlay.h b/source/blender/src/winlay.h
index 2f5cc3ce386..5cfac471710 100644
--- a/source/blender/src/winlay.h
+++ b/source/blender/src/winlay.h
@@ -64,7 +64,8 @@ char*	window_get_title	(Window *win);
 void	window_set_title	(Window *win, char *title);
 
 void	window_set_cursor	(Window *win, int cursor);
-void	window_set_custom_cursor	(Window *win, unsigned char mask[16][2], unsigned char bitmap[16][2]);
+void	window_set_custom_cursor	(Window *win, unsigned char mask[16][2], 
+				unsigned char bitmap[16][2], int hotx, int hoty );
 
 void	window_warp_pointer	(Window *win, int x, int y);