[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57184] trunk/blender: remove duplicate operator,

[Campbell Barton]

Revision: 57184
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57184
Author:   campbellbarton
Date:     2013-06-02 00:29:30 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
remove duplicate operator,
select-split and unlink-selection did the same thing,
keep select split since it fits closer to mesh editmode and single key access (Ykey).

Modified Paths:
--------------
    trunk/blender/release/scripts/presets/keyconfig/3dsmax.py
    trunk/blender/release/scripts/presets/keyconfig/maya.py
    trunk/blender/release/scripts/startup/bl_ui/space_image.py
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c

Modified: trunk/blender/release/scripts/presets/keyconfig/3dsmax.py
===================================================================
--- trunk/blender/release/scripts/presets/keyconfig/3dsmax.py	2013-06-02 00:20:26 UTC (rev 57183)
+++ trunk/blender/release/scripts/presets/keyconfig/3dsmax.py	2013-06-02 00:29:30 UTC (rev 57184)
@@ -788,7 +788,6 @@
 kmi.properties.extend = True
 kmi = km.keymap_items.new('uv.select_linked_pick', 'L', 'PRESS', shift=True)
 kmi.properties.extend = True
-kmi = km.keymap_items.new('uv.unlink_selected', 'L', 'PRESS', alt=True)
 kmi = km.keymap_items.new('uv.select_all', 'A', 'PRESS', ctrl=True)
 kmi.properties.action = 'TOGGLE'
 kmi = km.keymap_items.new('uv.select_all', 'I', 'PRESS', ctrl=True)

Modified: trunk/blender/release/scripts/presets/keyconfig/maya.py
===================================================================
--- trunk/blender/release/scripts/presets/keyconfig/maya.py	2013-06-02 00:20:26 UTC (rev 57183)
+++ trunk/blender/release/scripts/presets/keyconfig/maya.py	2013-06-02 00:29:30 UTC (rev 57184)
@@ -1112,7 +1112,6 @@
 kmi.properties.extend = True
 kmi = km.keymap_items.new('uv.select_linked_pick', 'L', 'PRESS', shift=True)
 kmi.properties.extend = True
-kmi = km.keymap_items.new('uv.unlink_selected', 'L', 'PRESS', alt=True)
 kmi = km.keymap_items.new('uv.select_all', 'A', 'PRESS', ctrl=True)
 kmi.properties.action = 'TOGGLE'
 kmi = km.keymap_items.new('uv.select_all', 'I', 'PRESS', ctrl=True)

Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py	2013-06-02 00:20:26 UTC (rev 57183)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py	2013-06-02 00:29:30 UTC (rev 57184)
@@ -106,7 +106,7 @@
 
         layout.operator("uv.select_all").action = 'TOGGLE'
         layout.operator("uv.select_all", text="Inverse").action = 'INVERT'
-        layout.operator("uv.unlink_selected")
+        layout.operator("uv.select_split")
 
         layout.separator()
 

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2013-06-02 00:20:26 UTC (rev 57183)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2013-06-02 00:29:30 UTC (rev 57184)
@@ -2530,72 +2530,6 @@
 	ot->poll = ED_operator_uvedit; /* requires space image */;
 }
 
-/* ******************** unlink selection operator **************** */
-
-static int uv_unlink_selection_exec(bContext *C, wmOperator *op)
-{
-	Scene *scene = CTX_data_scene(C);
-	ToolSettings *ts = scene->toolsettings;
-	Object *obedit = CTX_data_edit_object(C);
-	Image *ima = CTX_data_edit_image(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	BMFace *efa;
-	BMLoop *l;
-	BMIter iter, liter;
-	MTexPoly *tf;
-	MLoopUV *luv;
-
-	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
-	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
-
-	if (ts->uv_flag & UV_SYNC_SELECTION) {
-		BKE_report(op->reports, RPT_ERROR, "Cannot unlink selection when sync selection is enabled");
-		return OPERATOR_CANCELLED;
-	}
-	
-	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		int desel = 0;
-
-		tf = BM_ELEM_CD_GET_VOID_P(efa, cd_poly_tex_offset);
-		if (!uvedit_face_visible_test(scene, ima, efa, tf))
-			continue;
-
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-			
-			if (!(luv->flag & MLOOPUV_VERTSEL)) {
-				desel = 1;
-				break;
-			}
-		}
-
-		if (desel) {
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
-				luv->flag &= ~MLOOPUV_VERTSEL;
-			}
-		}
-	}
-	
-	DAG_id_tag_update(obedit->data, 0);
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
-
-	return OPERATOR_FINISHED;
-}
-
-static void UV_OT_unlink_selected(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Unlink Selection";
-	ot->description = "Unlink selected UV vertices from active UV map";
-	ot->idname = "UV_OT_unlink_selected";
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-	
-	/* api callbacks */
-	ot->exec = uv_unlink_selection_exec;
-	ot->poll = ED_operator_uvedit;
-}
-
 static void uv_select_sync_flush(ToolSettings *ts, BMEditMesh *em, const short select)
 {
 	/* bmesh API handles flushing but not on de-select */
@@ -4145,7 +4079,6 @@
 	WM_operatortype_append(UV_OT_select_linked);
 	WM_operatortype_append(UV_OT_select_linked_pick);
 	WM_operatortype_append(UV_OT_select_split);
-	WM_operatortype_append(UV_OT_unlink_selected);
 	WM_operatortype_append(UV_OT_select_pinned);
 	WM_operatortype_append(UV_OT_select_border);
 	WM_operatortype_append(UV_OT_select_lasso);
@@ -4228,7 +4161,6 @@
 	WM_keymap_add_item(keymap, "UV_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "UV_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
 
-	WM_keymap_add_item(keymap, "UV_OT_unlink_selected", LKEY, KM_PRESS, KM_ALT, 0);
 	kmi = WM_keymap_add_item(keymap, "UV_OT_select_all", AKEY, KM_PRESS, 0, 0);
 	RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
 	kmi = WM_keymap_add_item(keymap, "UV_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);