griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix duplicate items in edit-mesh select similar enum

Browse Source 
The enum contained two instances of NORMAL & FACE,
prefix with VERT/EDGE/FACE for clarity.
This commit is contained in:
Campbell Barton
2023-09-19 21:25:23 +10:00
parent 82be70a95f
commit 5815a00acf
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/blender/editors/mesh/editmesh_select_similar.cc
View File

@@ -52,32 +52,33 @@ static const EnumPropertyItem prop_similar_compare_types[] = {
};
static const EnumPropertyItem prop_similar_types[] = {
{SIMVERT_NORMAL, "NORMAL", 0, "Normal", ""},
{SIMVERT_FACE, "FACE", 0, "Amount of Adjacent Faces", ""},
{SIMVERT_VGROUP, "VGROUP", 0, "Vertex Groups", ""},
{SIMVERT_EDGE, "EDGE", 0, "Amount of Connecting Edges", ""},
{SIMVERT_CREASE, "VCREASE", 0, "Vertex Crease", ""},
{SIMEDGE_LENGTH, "LENGTH", 0, "Length", ""},
{SIMEDGE_DIR, "DIR", 0, "Direction", ""},
{SIMEDGE_FACE, "FACE", 0, "Amount of Faces Around an Edge", ""},
{SIMEDGE_FACE_ANGLE, "FACE_ANGLE", 0, "Face Angles", ""},
{SIMEDGE_CREASE, "CREASE", 0, "Crease", ""},
{SIMEDGE_BEVEL, "BEVEL", 0, "Bevel", ""},
{SIMEDGE_SEAM, "SEAM", 0, "Seam", ""},
{SIMEDGE_SHARP, "SHARP", 0, "Sharpness", ""},
{SIMVERT_NORMAL, "VERT_NORMAL", 0, "Normal", ""},
{SIMVERT_FACE, "VERT_FACES", 0, "Amount of Adjacent Faces", ""},
{SIMVERT_VGROUP, "VERT_GROUPS", 0, "Vertex Groups", ""},
{SIMVERT_EDGE, "VERT_EDGES", 0, "Amount of Connecting Edges", ""},
{SIMVERT_CREASE, "VERT_CREASE", 0, "Vertex Crease", ""},
{SIMEDGE_LENGTH, "EDGE_LENGTH", 0, "Length", ""},
{SIMEDGE_DIR, "EDGE_DIR", 0, "Direction", ""},
{SIMEDGE_FACE, "EDGE_FACES", 0, "Amount of Faces Around an Edge", ""},
{SIMEDGE_FACE_ANGLE, "EDGE_FACE_ANGLE", 0, "Face Angles", ""},
{SIMEDGE_CREASE, "EDGE_CREASE", 0, "Crease", ""},
{SIMEDGE_BEVEL, "EDGE_BEVEL", 0, "Bevel", ""},
{SIMEDGE_SEAM, "EDGE_SEAM", 0, "Seam", ""},
{SIMEDGE_SHARP, "EDGE_SHARP", 0, "Sharpness", ""},
#ifdef WITH_FREESTYLE
{SIMEDGE_FREESTYLE, "FREESTYLE_EDGE", 0, "Freestyle Edge Marks", ""},
{SIMEDGE_FREESTYLE, "EDGE_FREESTYLE", 0, "Freestyle Edge Marks", ""},
#endif
{SIMFACE_MATERIAL, "MATERIAL", 0, "Material", ""},
{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, "Coplanar", ""},
{SIMFACE_SMOOTH, "SMOOTH", 0, "Flat/Smooth", ""},
{SIMFACE_MATERIAL, "FACE_MATERIAL", 0, "Material", ""},
{SIMFACE_AREA, "FACE_AREA", 0, "Area", ""},
{SIMFACE_SIDES, "FACE_SIDES", 0, "Polygon Sides", ""},
{SIMFACE_PERIMETER, "FACE_PERIMETER", 0, "Perimeter", ""},
{SIMFACE_NORMAL, "FACE_NORMAL", 0, "Normal", ""},
{SIMFACE_COPLANAR, "FACE_COPLANAR", 0, "Coplanar", ""},
{SIMFACE_SMOOTH, "FACE_SMOOTH", 0, "Flat/Smooth", ""},
#ifdef WITH_FREESTYLE
{SIMFACE_FREESTYLE, "FREESTYLE_FACE", 0, "Freestyle Face Marks", ""},
{SIMFACE_FREESTYLE, "FACE_FREESTYLE", 0, "Freestyle Face Marks", ""},
#endif
{0, nullptr, 0, nullptr, nullptr},