[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45469] trunk/blender/source/blender/ editors/mesh/editmesh_tools.c: Fix [#30853] "Merge At Last" is missing in multicomponent mode

[Francisco De La Cruz]

Revision: 45469
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45469
Author:   xercesblue
Date:     2012-04-07 23:31:15 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
Fix [#30853] "Merge At Last" is missing in multicomponent mode

Mode selection inverted in multicomponent mode including vertices.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-07 19:53:39 UTC (rev 45468)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-07 23:31:15 UTC (rev 45469)
@@ -1949,10 +1949,10 @@
 				RNA_enum_items_add_value(&item, &totitem, merge_type_items, 1);
 			}
 			else if (em->bm->selected.first && ((BMEditSelection *)em->bm->selected.first)->htype == BM_VERT) {
-				RNA_enum_items_add_value(&item, &totitem, merge_type_items, 1);
+				RNA_enum_items_add_value(&item, &totitem, merge_type_items, 6);
 			}
 			else if (em->bm->selected.last && ((BMEditSelection *)em->bm->selected.last)->htype == BM_VERT) {
-				RNA_enum_items_add_value(&item, &totitem, merge_type_items, 6);
+				RNA_enum_items_add_value(&item, &totitem, merge_type_items, 1);
 			}
 		}