Robert (DetectiveThorn) Wenzlaff's Knife subdivide tool. See previous

message on Bf-committers for description.

3 files changed, 24 insertions, 21 deletions

diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index f4649a9574b..f14f120a386 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -155,7 +155,8 @@ typedef enum {
 	GHOST_kStandardCursorBottomRightCorner,
 	GHOST_kStandardCursorBottomLeftCorner,
 	GHOST_kStandardCursorCustom, 
-	GHOST_kStandardCursorNumCursors
+	GHOST_kStandardCursorNumCursors, 
+	GHOST_kStandardCursorPencil
 } GHOST_TStandardCursor;
 
 
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index f4e3d0ca1f0..dd1af92fa36 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -506,27 +506,28 @@ void GHOST_WindowWin32::loadCursor(bool visible, GHOST_TStandardCursor cursor) c
 		bool success = true;
 		LPCSTR id;
 		switch (cursor) {
-			case GHOST_kStandardCursorDefault:				id = IDC_ARROW;
-			case GHOST_kStandardCursorRightArrow:			id = IDC_ARROW;		break;
-			case GHOST_kStandardCursorLeftArrow:			id = IDC_ARROW;		break;
-			case GHOST_kStandardCursorInfo:					id = IDC_SIZEALL;	break;	// Four-pointed arrow pointing north, south, east, and west
-			case GHOST_kStandardCursorDestroy:				id = IDC_NO;		break;	// Slashed circle
-			case GHOST_kStandardCursorHelp:					id = IDC_HELP;		break;	// Arrow and question mark
-			case GHOST_kStandardCursorCycle:				id = IDC_NO;		break;	// Slashed circle
-			case GHOST_kStandardCursorSpray:				id = IDC_SIZEALL;	break;	// Four-pointed arrow pointing north, south, east, and west
-			case GHOST_kStandardCursorWait:					id = IDC_WAIT;		break;	// Hourglass
-			case GHOST_kStandardCursorText:					id = IDC_IBEAM;		break;	// I-beam
-			case GHOST_kStandardCursorCrosshair:			id = IDC_CROSS;		break;	// Crosshair
-			case GHOST_kStandardCursorUpDown:				id = IDC_SIZENS;	break;	// Double-pointed arrow pointing north and south
-			case GHOST_kStandardCursorLeftRight:			id = IDC_SIZEWE;	break;	// Double-pointed arrow pointing west and east
-			case GHOST_kStandardCursorTopSide:				id = IDC_UPARROW;	break;	// Vertical arrow
-			case GHOST_kStandardCursorBottomSide:			id = IDC_SIZENS;	break;
-			case GHOST_kStandardCursorLeftSide:				id = IDC_SIZEWE;	break;
-			case GHOST_kStandardCursorTopLeftCorner:		id = IDC_SIZENWSE;	break;
-			case GHOST_kStandardCursorTopRightCorner:		id = IDC_SIZENESW;	break;
+			case GHOST_kStandardCursorDefault:		id = IDC_ARROW; 	break;
+			case GHOST_kStandardCursorRightArrow:		id = IDC_ARROW;		break;
+			case GHOST_kStandardCursorLeftArrow:		id = IDC_ARROW;		break;
+			case GHOST_kStandardCursorInfo:			id = IDC_SIZEALL;	break;	// Four-pointed arrow pointing north, south, east, and west
+			case GHOST_kStandardCursorDestroy:		id = IDC_NO;		break;	// Slashed circle
+			case GHOST_kStandardCursorHelp:			id = IDC_HELP;		break;	// Arrow and question mark
+			case GHOST_kStandardCursorCycle:		id = IDC_NO;		break;	// Slashed circle
+			case GHOST_kStandardCursorSpray:		id = IDC_SIZEALL;	break;	// Four-pointed arrow pointing north, south, east, and west
+			case GHOST_kStandardCursorWait:			id = IDC_WAIT;		break;	// Hourglass
+			case GHOST_kStandardCursorText:			id = IDC_IBEAM;		break;	// I-beam
+			case GHOST_kStandardCursorCrosshair:		id = IDC_CROSS;		break;	// Crosshair
+			case GHOST_kStandardCursorUpDown:		id = IDC_SIZENS;	break;	// Double-pointed arrow pointing north and south
+			case GHOST_kStandardCursorLeftRight:		id = IDC_SIZEWE;	break;	// Double-pointed arrow pointing west and east
+			case GHOST_kStandardCursorTopSide:		id = IDC_UPARROW;	break;	// Vertical arrow
+			case GHOST_kStandardCursorBottomSide:		id = IDC_SIZENS;	break;
+			case GHOST_kStandardCursorLeftSide:		id = IDC_SIZEWE;	break;
+			case GHOST_kStandardCursorTopLeftCorner:	id = IDC_SIZENWSE;	break;
+			case GHOST_kStandardCursorTopRightCorner:	id = IDC_SIZENESW;	break;
 			case GHOST_kStandardCursorBottomRightCorner:	id = IDC_SIZENWSE;	break;
-			case GHOST_kStandardCursorBottomLeftCorner:		id = IDC_SIZENESW;	break;
-		default:
+			case GHOST_kStandardCursorBottomLeftCorner:	id = IDC_SIZENESW;	break;
+			case GHOST_kStandardCursorPencil:		id = IDC_CROSS; 	break;
+			default:
 			success = false;
 		}
 		
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index c3bf788035e..e22c3f135a3 100755
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -600,6 +600,7 @@ getStandardCursor(
 	GtoX(GHOST_kStandardCursorTopRightCorner, XC_top_right_corner); break;
 	GtoX(GHOST_kStandardCursorBottomRightCorner, XC_bottom_right_corner); break;
 	GtoX(GHOST_kStandardCursorBottomLeftCorner, XC_bottom_left_corner); break;
+	GtoX(GHOST_kStandardCursorPencil, XC_pencil); break;
 	default:
 		xcursor_id = 0;
 	}