[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24353] trunk/blender/source/blender: - circle select mouse wheel resize now works ( somehow mouse wheel generates a mouse up event)

[Campbell Barton]

Revision: 24353
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24353
Author:   campbellbarton
Date:     2009-11-05 16:59:14 +0100 (Thu, 05 Nov 2009)

Log Message:
-----------
- circle select mouse wheel resize now works (somehow mouse wheel generates a mouse up event)
- context.active_bone wasnt set to an editbone type

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_context.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_context.c	2009-11-05 14:54:02 UTC (rev 24352)
+++ trunk/blender/source/blender/editors/screen/screen_context.c	2009-11-05 15:59:14 UTC (rev 24353)
@@ -231,7 +231,7 @@
 			for (ebone= arm->edbo->first; ebone; ebone= ebone->next) {
 				if (EBONE_VISIBLE(arm, ebone)) {
 					if (ebone->flag & BONE_ACTIVE) {
-						CTX_data_pointer_set(result, &arm->id, &RNA_UnknownType, ebone);
+						CTX_data_pointer_set(result, &arm->id, &RNA_EditBone, ebone);
 						
 						return 1;
 					}

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2009-11-05 14:54:02 UTC (rev 24352)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2009-11-05 15:59:14 UTC (rev 24353)
@@ -1666,7 +1666,7 @@
 	wmGesture *gesture= op->customdata;
 	rcti *rect= gesture->customdata;
 	int sx, sy;
-	
+
 	switch(event->type) {
 		case MOUSEMOVE:
 			
@@ -1681,23 +1681,26 @@
 				gesture_circle_apply(C, op);
 
 			break;
-		case WHEELUPMOUSE:
+		case WHEELDOWNMOUSE:
+		case PADMINUS:
+		case MINUSKEY:
 			rect->xmax += 2 + rect->xmax/10;
 			wm_gesture_tag_redraw(C);
 			break;
-		case WHEELDOWNMOUSE:
+		case WHEELUPMOUSE:
+		case PADPLUSKEY:
+		case EQUALKEY:
 			rect->xmax -= 2 + rect->xmax/10;
 			if(rect->xmax < 1) rect->xmax= 1;
 			wm_gesture_tag_redraw(C);
 			break;
 		case LEFTMOUSE:
-		case MIDDLEMOUSE:
+//		case MIDDLEMOUSE: /* ??? - somehow mouse wheel are interpreted as middle mouse release events - campbell */
 		case RIGHTMOUSE:
 			if(event->val==KM_RELEASE) {	/* key release */
 				wm_gesture_end(C, op);
 				return OPERATOR_FINISHED;
-			}
-			else {
+			} else {
 				if( RNA_struct_find_property(op->ptr, "event_type") )
 					RNA_int_set(op->ptr, "event_type", event->type);