[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55118] trunk/blender/source/blender/ editors/space_view3d/view3d_ruler.c: add delete key for removing active ruler.

[Campbell Barton]

Revision: 55118
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55118
Author:   campbellbarton
Date:     2013-03-08 16:53:00 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
add delete key for removing active ruler.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c	2013-03-08 15:34:23 UTC (rev 55117)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c	2013-03-08 16:53:00 UTC (rev 55118)
@@ -158,13 +158,11 @@
 	return ruler_item;
 }
 
-#if 0
 static void ruler_item_remove(RulerInfo *ruler_info, RulerItem *ruler_item)
 {
 	BLI_remlink(&ruler_info->items, ruler_item);
 	MEM_freeN(ruler_item);
 }
-#endif
 
 static RulerItem *ruler_item_active_get(RulerInfo *ruler_info)
 {
@@ -726,13 +724,26 @@
 			}
 			break;
 		}
-
 		case ESCKEY:
 		{
 			do_draw = true;
 			exit_code = OPERATOR_CANCELLED;
 			break;
 		}
+		case DELKEY:
+		{
+			if (event->val == KM_PRESS) {
+				if (ruler_info->state == RULER_STATE_NORMAL) {
+					RulerItem *ruler_item = ruler_item_active_get(ruler_info);
+					if (ruler_item) {
+						ruler_item_remove(ruler_info, ruler_item);
+						ruler_info->item_active = -1;
+						do_draw = true;
+					}
+				}
+			}
+			break;
+		}
 		default:
 			exit_code = OPERATOR_PASS_THROUGH;
 			break;