- remove some unused editmesh functions.

- copy & rename EditMesh stricts for use with scanfill (remove unused members)

4 files changed, 4 insertions, 7 deletions

diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index bab9ed60f16..4f5fc2a59ce 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -54,7 +54,6 @@
 
 #include "DNA_scene_types.h"
 
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 
 #include "BKE_customdata.h"
@@ -447,7 +446,7 @@ static void rna_MeshLoopColor_color_set(PointerRNA *ptr, const float *values)
 static int rna_Mesh_texspace_editable(PointerRNA *ptr)
 {
 	Mesh *me= (Mesh*)ptr->data;
-	return (me->texflag & AUTOSPACE)? 0: PROP_EDITABLE;
+	return (me->texflag & ME_AUTOSPACE)? 0: PROP_EDITABLE;
 }
 
 static void rna_MeshVertex_groups_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
@@ -1932,7 +1931,7 @@ void rna_def_texmat_common(StructRNA *srna, const char *texspace_editable)
 
 	/* texture space */
 	prop= RNA_def_property(srna, "auto_texspace", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "texflag", AUTOSPACE);
+	RNA_def_property_boolean_sdna(prop, NULL, "texflag", ME_AUTOSPACE);
 	RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object");
 
 	prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION);
@@ -2511,7 +2510,7 @@ static void rna_def_mesh(BlenderRNA *brna)
 	
 	/* texture space */
 	prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "texflag", AUTOSPACE);
+	RNA_def_property_boolean_sdna(prop, NULL, "texflag", ME_AUTOSPACE);
 	RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object");
 
 	/*prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 6bcd8c0a5bc..728ea7c59a6 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -35,6 +35,7 @@
 #include "rna_internal.h"
 
 #include "DNA_armature_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index a5eb610dd29..ed443f47eb3 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -148,8 +148,6 @@ EnumPropertyItem object_type_curve_items[] = {
 #include "BKE_scene.h"
 #include "BKE_deform.h"
 
-#include "BLI_editVert.h" /* for EditMesh->mat_nr */
-
 #include "ED_mesh.h"
 #include "ED_object.h"
 #include "ED_particle.h"
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index e3ae8f52b15..8483478838d 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -256,7 +256,6 @@ EnumPropertyItem image_color_depth_items[] = {
 #include "MEM_guardedalloc.h"
 
 #include "BLI_threads.h"
-#include "BLI_editVert.h"
 
 #include "BKE_brush.h"
 #include "BKE_context.h"