2.5 / Drag & Drop

Removed all related code. Talked with Ton about this and agreed to postpone it at indefinite time in the future, when things get more relaxed.
Files saved since my first commit should not break although I'm not 100% sure.

3 files changed, 0 insertions, 55 deletions

diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 382ba68e95f..3e9382509f4 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -115,7 +115,6 @@ void VIEW3D_OT_select_extend(struct wmOperatorType *ot);
 void VIEW3D_OT_select_circle(struct wmOperatorType *ot);
 void VIEW3D_OT_select_border(struct wmOperatorType *ot);
 void VIEW3D_OT_select_lasso(struct wmOperatorType *ot);
-void VIEW3D_OT_drag(struct wmOperatorType *ot);
 
 /* view3d_view.c */
 void VIEW3D_OT_smoothview(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index c82db3bbe32..112847272e5 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -73,7 +73,6 @@ void view3d_operatortypes(void)
 	WM_operatortype_append(VIEW3D_OT_view_center);
 	WM_operatortype_append(VIEW3D_OT_select);
 	WM_operatortype_append(VIEW3D_OT_select_border);
-	WM_operatortype_append(VIEW3D_OT_drag);
 	WM_operatortype_append(VIEW3D_OT_clip_border);
 	WM_operatortype_append(VIEW3D_OT_select_circle);
 	WM_operatortype_append(VIEW3D_OT_smoothview);
@@ -217,9 +216,6 @@ void view3d_keymap(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "VIEW3D_OT_camera_to_view", PAD0, KM_PRESS, KM_ALT|KM_CTRL, 0);
 	
 	WM_keymap_add_item(keymap, "VIEW3D_OT_snap_menu", SKEY, KM_PRESS, KM_SHIFT, 0);
-
-	/* drag & drop (disabled) */
-//	WM_keymap_add_item(keymap, "VIEW3D_OT_drag", MOUSEDRAG, KM_ANY, 0, 0);
 	
 	/* radial control */
 	RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_radial_control", FKEY, KM_PRESS, 0, 0)->ptr, "mode", WM_RADIALCONTROL_SIZE);
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 4a702665c88..54e556b58ed 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1602,56 +1602,6 @@ void VIEW3D_OT_select(wmOperatorType *ot)
 }
 
 
-/* ****** Drag & Drop ****** */
-
-static int view3d_drag_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	wmWindow *win= CTX_wm_window(C);
-	Object *ob= CTX_data_active_object(C);
-	PointerRNA ptr;
-
-	RNA_pointer_create(NULL, &RNA_Object, ob, &ptr);
-
-	return OPERATOR_RUNNING_MODAL;
-}
-
-static int view3d_drag_modal(bContext *C, wmOperator *op, wmEvent *event)
-{
-	switch(event->type) {
-		case MOUSEDRAG:
-
-			break;
-		case MOUSEDROP:
-			return OPERATOR_FINISHED;
-		case ESCKEY:
-			return OPERATOR_CANCELLED;
-	}
-
-	return OPERATOR_RUNNING_MODAL;
-}
-
-static int view3d_drag_exec(bContext *C, wmOperator *op)
-{
-	return OPERATOR_FINISHED;
-}
-
-void VIEW3D_OT_drag(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Drag";
-	ot->idname= "VIEW3D_OT_drag";
-	
-	/* api callbacks */
-	ot->invoke= view3d_drag_invoke;
-	ot->modal= view3d_drag_modal;
-	ot->exec= view3d_drag_exec;
-	ot->poll= ED_operator_view3d_active;
-	
-	/* flags */
-	/* ot->flag= OPTYPE_UNDO; */
-}
-
-
 /* -------------------- circle select --------------------------------------------- */
 
 static void mesh_circle_doSelectVert(void *userData, EditVert *eve, int x, int y, int index)