Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / mesh / editmesh_select.c
index 68bd8ff27b1d1da8d4b9e5a2a8f8d23882dac75d..c8d8ac683349b44c4651fb5997d8d4d4c6b58c97 100644 (file)
@@ -989,13 +989,13 @@ static EnumPropertyItem prop_similar_types[] = {
 #endif
 
        {SIMFACE_MATERIAL, "MATERIAL", 0, "Material", ""},
-       {SIMFACE_IMAGE, "IMAGE", 0, "Image", ""},
        {SIMFACE_AREA, "AREA", 0, "Area", ""},
        {SIMFACE_SIDES, "SIDES", 0, "Polygon Sides", ""},
        {SIMFACE_PERIMETER, "PERIMETER", 0, "Perimeter", ""},
        {SIMFACE_NORMAL, "NORMAL", 0, "Normal", ""},
        {SIMFACE_COPLANAR, "COPLANAR", 0, "Co-planar", ""},
        {SIMFACE_SMOOTH, "SMOOTH", 0, "Flat/Smooth", ""},
+       {SIMFACE_FACEMAP, "FACE_MAP", 0, "Face-Map", ""},
 #ifdef WITH_FREESTYLE
        {SIMFACE_FREESTYLE, "FREESTYLE_FACE", 0, "Freestyle Face Marks", ""},
 #endif
@@ -1173,7 +1173,7 @@ static EnumPropertyItem *select_similar_type_itemf(bContext *C, PointerRNA *UNUS
 #ifdef WITH_FREESTYLE
                        const int a_end = SIMFACE_FREESTYLE;
 #else
-                       const int a_end = SIMFACE_SMOOTH;
+                       const int a_end = SIMFACE_FACEMAP;
 #endif
                        for (a = SIMFACE_MATERIAL; a <= a_end; a++) {
                                RNA_enum_items_add_value(&item, &totitem, prop_similar_types, a);