diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-06-03 09:07:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-03 09:07:16 +0400 |
| commit | 790e9d9fa084c30609a13d175c56a4f3c14f132e (patch) | |
| tree | e56e66a7b0e5d1eef4153be76b1d2cc0b97c9fa6 /source/blender/makesrna/intern/rna_mesh.c | |
| parent | 8a1ef33e88d2683f8566f4db8edbc3dc2f488307 (diff) | |
fix [#35311] Planar Decimate / Limited Dissolve fails to merge some adjacent faces
optionally limit by face flipping, also added support to delimit by material and edge crease.
Diffstat (limited to 'source/blender/makesrna/intern/rna_mesh.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 9c1b9a9630b..7e54f665214 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -42,6 +42,8 @@ #include "BLI_math_rotation.h" #include "BLI_utildefines.h" +#include "BKE_editmesh.h" + #include "RNA_access.h" #include "RNA_define.h" #include "RNA_types.h" @@ -50,6 +52,13 @@ #include "WM_types.h" +EnumPropertyItem mesh_delimit_mode_items[] = { + {BMO_DELIM_NORMAL, "NORMAL", 0, "Normal", "Delimit by face directions"}, + {BMO_DELIM_MATERIAL, "MATERIAL", 0, "Material", "Delimit by face material"}, + {BMO_DELIM_SEAM, "SEAM", 0, "Seam", "Delimit by edge seams"}, + {0, NULL, 0, NULL, NULL}, +}; + #ifdef RNA_RUNTIME #include "DNA_scene_types.h" @@ -60,7 +69,6 @@ #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_editmesh.h" #include "BKE_report.h" #include "ED_mesh.h" /* XXX Bad level call */ |