- remove some unused editmesh functions.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 19 Feb 2012 22:17:30 +0000 (22:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 19 Feb 2012 22:17:30 +0000 (22:17 +0000)
- copy & rename EditMesh stricts for use with scanfill (remove unused members)

84 files changed:
source/blender/blenkernel/BKE_bmesh.h
source/blender/blenkernel/BKE_cdderivedmesh.h
source/blender/blenkernel/BKE_context.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_displist.h
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/BKE_subsurf.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenlib/BLI_scanfill.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/scanfill.c
source/blender/bmesh/operators/bmo_triangulate.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/mesh/bmesh_utils.c
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/knifetool.c
source/blender/editors/mesh/loopcut.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_navmesh.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_transform.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/render/render_opengl.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_graph/graph_utils.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/util/crazyspace.c
source/blender/editors/util/ed_util.c
source/blender/editors/util/undo.c
source/blender/editors/uvedit/uvedit_buttons.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/windowmanager/intern/wm_gesture.c

index 36760d387a14a99db1ce465c1b6bab0c4c532a35..06b4df8b05c18b66273cce940fa697c12e8bbf6e 100644 (file)
@@ -41,7 +41,6 @@
 #include "BLI_mempool.h"
 #include "BLI_memarena.h"
 #include "DNA_image_types.h"
-#include "BLI_editVert.h"
 #include "BKE_DerivedMesh.h"
 //XXX #include "transform.h"
 #include "bmesh.h"
@@ -250,9 +249,4 @@ void BME_free_transdata(struct BME_TransData_Head *td);
 float *BME_bevel_calc_polynormal(struct BME_Poly *f, struct BME_TransData_Head *td);
 struct BMesh *BME_bevel(struct BMEditMesh *em, float value, int res, int options, int defgrp_index, float angle, BME_TransData_Head **rtd);
 
-/*CONVERSION FUNCTIONS*/
-struct BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em);
-void   BME_bmesh_to_editmesh(struct BME_Mesh *bm, BME_TransData_Head *td, EditMesh *em);
-struct BME_Mesh *BME_derivedmesh_to_bmesh(struct DerivedMesh *dm);
-struct DerivedMesh *BME_bmesh_to_derivedmesh(struct BME_Mesh *bm, struct DerivedMesh *dm);
 #endif
index 053749148a07f59d674cc958616b38dd7ad872bf..5fda391cd808e5fdcae9fd6f2417733f65b8e8a1 100644 (file)
@@ -39,7 +39,6 @@
 
 struct DerivedMesh;
 struct BMEditMesh;
-struct EditMesh;
 struct Mesh;
 struct Object;
 
index 78354cd4713e67bc45b91c5f2d883a1fe92d31de..c4f860e820f0b9e1c7953351a16146b2c5e366ee 100644 (file)
@@ -39,7 +39,6 @@ extern "C" {
 
 struct ARegion;
 struct bScreen;
-struct EditMesh;
 struct ListBase;
 struct Main;
 struct Object;
index 6159240f92d1b089a0356180f70d9814c515ca70..e5e172accca1edacc426e9f98df595597715c921 100644 (file)
@@ -178,13 +178,9 @@ void CustomData_copy_data(const struct CustomData *source,
                                                  struct CustomData *dest, int source_index,
                                                  int dest_index, int count);
 void CustomData_copy_elements(int type, void *source, void *dest, int count);
-void CustomData_em_copy_data(const struct CustomData *source,
-                                                       struct CustomData *dest, void *src_block,
-                                                       void **dest_block);
 void CustomData_bmesh_copy_data(const struct CustomData *source, 
                                 struct CustomData *dest, void *src_block, 
                                 void **dest_block);
-void CustomData_em_validate_data(struct CustomData *data, void *block, int sub_elements);
 
 /* frees data in a CustomData object
  * return 1 on success, 0 on failure
@@ -208,9 +204,6 @@ void CustomData_free_elem(struct CustomData *data, int index, int count);
 void CustomData_interp(const struct CustomData *source, struct CustomData *dest,
                                           int *src_indices, float *weights, float *sub_weights,
                                           int count, int dest_index);
-void CustomData_em_interp(struct CustomData *data,  void **src_blocks,
-                                                 float *weights, float *sub_weights, int count,
-                                                 void *dest_block);
 void CustomData_bmesh_interp(struct CustomData *data, void **src_blocks, 
                                                         float *weights, float *sub_weights, int count, 
                                                         void *dest_block);
@@ -226,8 +219,6 @@ void CustomData_swap(struct CustomData *data, int index, const int *corner_indic
  */
 void *CustomData_get(const struct CustomData *data, int index, int type);
 void *CustomData_get_n(const struct CustomData *data, int type, int index, int n);
-void *CustomData_em_get(const struct CustomData *data, void *block, int type);
-void *CustomData_em_get_n(const struct CustomData *data, void *block, int type, int n);
 void *CustomData_bmesh_get(const struct CustomData *data, void *block, int type);
 void *CustomData_bmesh_get_n(const struct CustomData *data, void *block, int type, int n);
 
@@ -263,10 +254,6 @@ int CustomData_get_stencil_layer(const struct CustomData *data, int type);
  */
 void CustomData_set(const struct CustomData *data, int index, int type,
                                        void *source);
-void CustomData_em_set(struct CustomData *data, void *block, int type,
-                                          void *source);
-void CustomData_em_set_n(struct CustomData *data, void *block, int type, int n,
-                                                void *source);
 
 void CustomData_bmesh_set(const struct CustomData *data, void *block, int type, 
                                                  void *source);
@@ -300,10 +287,6 @@ void CustomData_set_layer_stencil_index(struct CustomData *data, int type, int n
 /* adds flag to the layer flags */
 void CustomData_set_layer_flag(struct CustomData *data, int type, int flag);
 
-/* alloc/free a block of custom data attached to one element in editmode */
-void CustomData_em_set_default(struct CustomData *data, void **block);
-void CustomData_em_free_block(struct CustomData *data, void **block);
-
 void CustomData_bmesh_set_default(struct CustomData *data, void **block);
 void CustomData_bmesh_free_block(struct CustomData *data, void **block);
 
index f43ec749a694f05bd57193af37ec63fa7ef2caed..5a36add2834a2db69eb9e2104615e77090a7f146 100644 (file)
@@ -63,7 +63,6 @@ struct ListBase;
 struct Material;
 struct Bone;
 struct Mesh;
-struct EditMesh;
 struct DerivedMesh;
 
 /* used for curves, nurbs, mball, importing */
index f3307b731874190f234848996d61633241c0932b..de4f0a7eac63c1a832507a59941ceeebbee81fac 100644 (file)
@@ -35,7 +35,6 @@
 #include "BKE_customdata.h"
 
 struct ID;
-struct EditMesh;
 struct DerivedMesh;
 struct DagForest;
 struct DagNode;
index cf77ea85c153c4bc6ec1e806b9c6e3345c306d17..35de1c21a542711c915e8f63bd4f48720292b9e3 100644 (file)
@@ -34,7 +34,6 @@
 struct DMGridAdjacency;
 struct DMGridData;
 struct DerivedMesh;
-struct EditMesh;
 struct IndexNode;
 struct ListBase;
 struct Mesh;
index 573edb78687b98d88727db74cb0fdd590a1a3452..7e491ff5f7c8d561b8bca757aee0b9782e69a407 100644 (file)
 
 #include "DNA_cloth_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h" // N_T
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_array.h"
@@ -761,7 +761,7 @@ static float *get_editbmesh_orco_verts(BMEditMesh *em)
 
        totvert= em->bm->totvert;
        
-       orco = MEM_mallocN(sizeof(float)*3*totvert, "EditMesh Orco");
+       orco = MEM_mallocN(sizeof(float)*3*totvert, "BMEditMesh Orco");
 
        eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
        for (a=0; eve; eve=BM_iter_step(&iter), a+=3) {
index 11700d7f0728f2831409c3758992ede3ce72e11e..bfafd96b95e58db1018bb137c313ac1de31ad86d 100644 (file)
@@ -37,7 +37,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
@@ -46,6 +45,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_group_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_vfont_types.h"
index 5c50c14f1a8a272db200f725c5b526b9bf5f63e8..f4416b8f5d6044c53d0d35dc7d7e725633bddca6 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "DNA_meshdata_types.h"
 
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 #include "BLI_linklist.h"
 
index 2be23e1f182afa7e3b80248e69c28c29823d4ada..9f3c9fc8b780e8af8af66620a448241d4cc80815 100644 (file)
 #include "BKE_utildefines.h"
 #include "BKE_tessmesh.h"
 
-#include "BLI_editVert.h"
 #include "BLI_scanfill.h"
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_edgehash.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
 #include "BLI_array.h"
@@ -61,6 +59,7 @@
 #include "BKE_paint.h"
 
 
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_curve_types.h" /* for Curve */
@@ -1793,104 +1792,6 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh, Object *UNUSED(ob))
        return dm;
 }
 
-static DerivedMesh *UNUSED_FUNCTION(CDDM_from_editmesh)(EditMesh *em, Mesh *UNUSED(me))
-{
-       DerivedMesh *dm = CDDM_new(BLI_countlist(&em->verts),
-                                  BLI_countlist(&em->edges),
-                                  BLI_countlist(&em->faces), 0, 0);
-       CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
-       EditVert *eve;
-       EditEdge *eed;
-       EditFace *efa;
-       MVert *mvert = cddm->mvert;
-       MEdge *medge = cddm->medge;
-       MFace *mface = cddm->mface;
-       int i, *index;
-
-       dm->deformedOnly = 1;
-
-       CustomData_merge(&em->vdata, &dm->vertData, CD_MASK_DERIVEDMESH,
-                                        CD_CALLOC, dm->numVertData);
-       /* CustomData_merge(&em->edata, &dm->edgeData, CD_MASK_DERIVEDMESH,
-                                        CD_CALLOC, dm->numEdgeData); */
-       CustomData_merge(&em->fdata, &dm->faceData, CD_MASK_DERIVEDMESH,
-                                        CD_CALLOC, dm->numTessFaceData);
-       CustomData_merge(&em->fdata, &dm->faceData, CD_MASK_DERIVEDMESH,
-                        CD_CALLOC, dm->numTessFaceData);
-
-       /* set eve->hash to vert index */
-       for(i = 0, eve = em->verts.first; eve; eve = eve->next, ++i)
-               eve->tmp.l = i;
-
-       /* Need to be able to mark loose edges */
-       for(eed = em->edges.first; eed; eed = eed->next) {
-               eed->f2 = 0;
-       }
-       for(efa = em->faces.first; efa; efa = efa->next) {
-               efa->e1->f2 = 1;
-               efa->e2->f2 = 1;
-               efa->e3->f2 = 1;
-               if(efa->e4) efa->e4->f2 = 1;
-       }
-
-       index = dm->getVertDataArray(dm, CD_ORIGINDEX);
-       for(i = 0, eve = em->verts.first; i < dm->numVertData;
-               i++, eve = eve->next, index++) {
-               MVert *mv = &mvert[i];
-
-               copy_v3_v3(mv->co, eve->co);
-
-               normal_float_to_short_v3(mv->no, eve->no);
-               mv->bweight = (unsigned char) (eve->bweight * 255.0f);
-
-               mv->flag = 0;
-
-               *index = i;
-
-               CustomData_from_em_block(&em->vdata, &dm->vertData, eve->data, i);
-       }
-
-       index = dm->getEdgeDataArray(dm, CD_ORIGINDEX);
-       for(i = 0, eed = em->edges.first; i < dm->numEdgeData;
-               i++, eed = eed->next, index++) {
-               MEdge *med = &medge[i];
-
-               med->v1 = eed->v1->tmp.l;
-               med->v2 = eed->v2->tmp.l;
-               med->crease = (unsigned char) (eed->crease * 255.0f);
-               med->bweight = (unsigned char) (eed->bweight * 255.0f);
-               med->flag = ME_EDGEDRAW|ME_EDGERENDER;
-               
-               if(eed->seam) med->flag |= ME_SEAM;
-               if(eed->sharp) med->flag |= ME_SHARP;
-               if(!eed->f2) med->flag |= ME_LOOSEEDGE;
-
-               *index = i;
-
-               /* CustomData_from_em_block(&em->edata, &dm->edgeData, eed->data, i); */
-       }
-
-       index = dm->getTessFaceDataArray(dm, CD_POLYINDEX);
-       for(i = 0, efa = em->faces.first; i < dm->numTessFaceData;
-               i++, efa = efa->next, index++) {
-               MFace *mf = &mface[i];
-
-               mf->v1 = efa->v1->tmp.l;
-               mf->v2 = efa->v2->tmp.l;
-               mf->v3 = efa->v3->tmp.l;
-               mf->v4 = efa->v4 ? efa->v4->tmp.l : 0;
-               mf->mat_nr = efa->mat_nr;
-               mf->flag = efa->flag;
-
-               *index = i;
-
-               CustomData_from_em_block(&em->fdata, &dm->faceData, efa->data, i);
-               test_index_face(mf, &dm->faceData, i, efa->v4?4:3);
-       }
-
-       return dm;
-}
-
 DerivedMesh *CDDM_from_curve(Object *ob)
 {
        return CDDM_from_curve_customDB(ob, &ob->disp);
index 4f3fc40616b33f490c299eed7ff35281029ef034..833f14ff074208174fe606f60f2ed6be48a23f26 100644 (file)
@@ -40,7 +40,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_kdopbvh.h"
 #include "BLI_utildefines.h"
 
index a4c1fd87009a486139acac4bcdb9f1978f5b4739..6cb8b65dbaf49d64e7c0909b839024189ed69a44 100644 (file)
@@ -2154,287 +2154,6 @@ void CustomData_set(const CustomData *data, int index, int type, void *source)
                memcpy(dest, source, typeInfo->size);
 }
 
-/* EditMesh functions */
-
-void CustomData_em_free_block(CustomData *data, void **block)
-{
-       const LayerTypeInfo *typeInfo;
-       int i;
-
-       if(!*block) return;
-
-       for(i = 0; i < data->totlayer; ++i) {
-               if(!(data->layers[i].flag & CD_FLAG_NOFREE)) {
-                       typeInfo = layerType_getInfo(data->layers[i].type);
-
-                       if(typeInfo->free) {
-                               int offset = data->layers[i].offset;
-                               typeInfo->free((char*)*block + offset, 1, typeInfo->size);
-                       }
-               }
-       }
-
-       MEM_freeN(*block);
-       *block = NULL;
-}
-
-static void CustomData_em_alloc_block(CustomData *data, void **block)
-{
-       /* TODO: optimize free/alloc */
-
-       if (*block)
-               CustomData_em_free_block(data, block);
-
-       if (data->totsize > 0)
-               *block = MEM_callocN(data->totsize, "CustomData EM block");
-       else
-               *block = NULL;
-}
-
-void CustomData_em_copy_data(const CustomData *source, CustomData *dest,
-                                                       void *src_block, void **dest_block)
-{
-       const LayerTypeInfo *typeInfo;
-       int dest_i, src_i;
-
-       if (!*dest_block)
-               CustomData_em_alloc_block(dest, dest_block);
-       
-       /* copies a layer at a time */
-       dest_i = 0;
-       for(src_i = 0; src_i < source->totlayer; ++src_i) {
-
-               /* find the first dest layer with type >= the source type
-                * (this should work because layers are ordered by type)
-                */
-               while(dest_i < dest->totlayer
-                         && dest->layers[dest_i].type < source->layers[src_i].type)
-                       ++dest_i;
-
-               /* if there are no more dest layers, we're done */
-               if(dest_i >= dest->totlayer) return;
-
-               /* if we found a matching layer, copy the data */
-               if(dest->layers[dest_i].type == source->layers[src_i].type &&
-                       strcmp(dest->layers[dest_i].name, source->layers[src_i].name) == 0) {
-                       char *src_data = (char*)src_block + source->layers[src_i].offset;
-                       char *dest_data = (char*)*dest_block + dest->layers[dest_i].offset;
-
-                       typeInfo = layerType_getInfo(source->layers[src_i].type);
-
-                       if(typeInfo->copy)
-                               typeInfo->copy(src_data, dest_data, 1);
-                       else
-                               memcpy(dest_data, src_data, typeInfo->size);
-
-                       /* if there are multiple source & dest layers of the same type,
-                        * we don't want to copy all source layers to the same dest, so
-                        * increment dest_i
-                        */
-                       ++dest_i;
-               }
-       }
-}
-
-void CustomData_em_validate_data(CustomData *data, void *block, int sub_elements)
-{
-       int i;
-       for(i = 0; i < data->totlayer; i++) {
-               const LayerTypeInfo *typeInfo = layerType_getInfo(data->layers[i].type);
-               char *leayer_data = (char*)block + data->layers[i].offset;
-
-               if(typeInfo->validate)
-                       typeInfo->validate(leayer_data, sub_elements);
-       }
-}
-
-void *CustomData_em_get(const CustomData *data, void *block, int type)
-{
-       int layer_index;
-       
-       /* get the layer index of the first layer of type */
-       layer_index = CustomData_get_active_layer_index(data, type);
-       if(layer_index < 0) return NULL;
-
-       return (char *)block + data->layers[layer_index].offset;
-}
-
-void *CustomData_em_get_n(const CustomData *data, void *block, int type, int n)
-{
-       int layer_index;
-       
-       /* get the layer index of the first layer of type */
-       layer_index = CustomData_get_layer_index_n(data, type, n);
-       if(layer_index < 0) return NULL;
-
-       return (char *)block + data->layers[layer_index].offset;
-}
-
-void CustomData_em_set(CustomData *data, void *block, int type, void *source)
-{
-       void *dest = CustomData_em_get(data, block, type);
-       const LayerTypeInfo *typeInfo = layerType_getInfo(type);
-
-       if(!dest) return;
-
-       if(typeInfo->copy)
-               typeInfo->copy(source, dest, 1);
-       else
-               memcpy(dest, source, typeInfo->size);
-}
-
-void CustomData_em_set_n(CustomData *data, void *block, int type, int n, void *source)
-{
-       void *dest = CustomData_em_get_n(data, block, type, n);
-       const LayerTypeInfo *typeInfo = layerType_getInfo(type);
-
-       if(!dest) return;
-
-       if(typeInfo->copy)
-               typeInfo->copy(source, dest, 1);
-       else
-               memcpy(dest, source, typeInfo->size);
-}
-
-void CustomData_em_interp(CustomData *data, void **src_blocks, float *weights,
-                                                 float *sub_weights, int count, void *dest_block)
-{
-       int i, j;
-       void *source_buf[SOURCE_BUF_SIZE];
-       void **sources = source_buf;
-
-       /* slow fallback in case we're interpolating a ridiculous number of
-        * elements
-        */
-       if(count > SOURCE_BUF_SIZE)
-               sources = MEM_callocN(sizeof(*sources) * count,
-                                                         "CustomData_interp sources");
-
-       /* interpolates a layer at a time */
-       for(i = 0; i < data->totlayer; ++i) {
-               CustomDataLayer *layer = &data->layers[i];
-               const LayerTypeInfo *typeInfo = layerType_getInfo(layer->type);
-
-               if(typeInfo->interp) {
-                       for(j = 0; j < count; ++j)
-                               sources[j] = (char *)src_blocks[j] + layer->offset;
-
-                       typeInfo->interp(sources, weights, sub_weights, count,
-                                                         (char *)dest_block + layer->offset);
-               }
-       }
-
-       if(count > SOURCE_BUF_SIZE) MEM_freeN(sources);
-}
-
-void CustomData_em_set_default(CustomData *data, void **block)
-{
-       const LayerTypeInfo *typeInfo;
-       int i;
-
-       if (!*block)
-               CustomData_em_alloc_block(data, block);
-
-       for(i = 0; i < data->totlayer; ++i) {
-               int offset = data->layers[i].offset;
-
-               typeInfo = layerType_getInfo(data->layers[i].type);
-
-               if(typeInfo->set_default)
-                       typeInfo->set_default((char*)*block + offset, 1);
-       }
-}
-
-void CustomData_to_em_block(const CustomData *source, CustomData *dest,
-                                                       int src_index, void **dest_block)
-{
-       const LayerTypeInfo *typeInfo;
-       int dest_i, src_i, src_offset;
-
-       if (!*dest_block)
-               CustomData_em_alloc_block(dest, dest_block);
-       
-       /* copies a layer at a time */
-       dest_i = 0;
-       for(src_i = 0; src_i < source->totlayer; ++src_i) {
-
-               /* find the first dest layer with type >= the source type
-                * (this should work because layers are ordered by type)
-                */
-               while(dest_i < dest->totlayer
-                         && dest->layers[dest_i].type < source->layers[src_i].type)
-                       ++dest_i;
-
-               /* if there are no more dest layers, we're done */
-               if(dest_i >= dest->totlayer) return;
-
-               /* if we found a matching layer, copy the data */
-               if(dest->layers[dest_i].type == source->layers[src_i].type) {
-                       int offset = dest->layers[dest_i].offset;
-                       char *src_data = source->layers[src_i].data;
-                       char *dest_data = (char*)*dest_block + offset;
-
-                       typeInfo = layerType_getInfo(dest->layers[dest_i].type);
-                       src_offset = src_index * typeInfo->size;
-
-                       if(typeInfo->copy)
-                               typeInfo->copy(src_data + src_offset, dest_data, 1);
-                       else
-                               memcpy(dest_data, src_data + src_offset, typeInfo->size);
-
-                       /* if there are multiple source & dest layers of the same type,
-                        * we don't want to copy all source layers to the same dest, so
-                        * increment dest_i
-                        */
-                       ++dest_i;
-               }
-       }
-}
-
-void CustomData_from_em_block(const CustomData *source, CustomData *dest,
-                                                         void *src_block, int dest_index)
-{
-       const LayerTypeInfo *typeInfo;
-       int dest_i, src_i, dest_offset;
-
-       /* copies a layer at a time */
-       dest_i = 0;
-       for(src_i = 0; src_i < source->totlayer; ++src_i) {
-
-               /* find the first dest layer with type >= the source type
-                * (this should work because layers are ordered by type)
-                */
-               while(dest_i < dest->totlayer
-                         && dest->layers[dest_i].type < source->layers[src_i].type)
-                       ++dest_i;
-
-               /* if there are no more dest layers, we're done */
-               if(dest_i >= dest->totlayer) return;
-
-               /* if we found a matching layer, copy the data */
-               if(dest->layers[dest_i].type == source->layers[src_i].type) {
-                       int offset = source->layers[src_i].offset;
-                       char *src_data = (char*)src_block + offset;
-                       char *dest_data = dest->layers[dest_i].data;
-
-                       typeInfo = layerType_getInfo(dest->layers[dest_i].type);
-                       dest_offset = dest_index * typeInfo->size;
-
-                       if(typeInfo->copy)
-                               typeInfo->copy(src_data, dest_data + dest_offset, 1);
-                       else
-                               memcpy(dest_data + dest_offset, src_data, typeInfo->size);
-
-                       /* if there are multiple source & dest layers of the same type,
-                        * we don't want to copy all source layers to the same dest, so
-                        * increment dest_i
-                        */
-                       ++dest_i;
-               }
-       }
-
-}
-
 /*Bmesh functions*/
 /*needed to convert to/from different face reps*/
 void CustomData_to_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata,
index 2a971c45232a99ec8bf971ad60e14e3307559447..3a67c66165a4e888b9019eb2e0f884be99524af3 100644 (file)
@@ -44,7 +44,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_scanfill.h"
 #include "BLI_utildefines.h"
 
@@ -417,8 +416,8 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase, i
 
 void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
 {
-       EditVert *eve, *v1, *vlast;
-       EditFace *efa;
+       ScanFillVert *eve, *v1, *vlast;
+       ScanFillFace *efa;
        DispList *dlnew=NULL, *dl;
        float *f1;
        int colnr=0, charidx=0, cont=1, tot, a, *index, nextcol= 0;
index ee06600dab68f423e813a9cded4c4e76051278c4..766febc06031d06b3636083f153d89092d4bef7c 100644 (file)
@@ -38,7 +38,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_edgehash.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
 
@@ -191,9 +190,9 @@ static void BMEdit_RecalcTesselation_intern(BMEditMesh *tm)
 #endif /* USE_TESSFACE_SPEEDUP */
 
                else {
-                       EditVert *v, *lastv=NULL, *firstv=NULL;
-                       EditEdge *e;
-                       EditFace *efa;
+                       ScanFillVert *v, *lastv=NULL, *firstv=NULL;
+                       ScanFillEdge *e;
+                       ScanFillFace *efa;
                        int totfilltri;
 
                        BLI_begin_edgefill();
index 84af6200f94efe9529258fb3e6c53dbfaebf98d2..1b67822513578996f5e8f13048dc7ead72233032 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index 05c90bf4d0c46c7673247cb0b1d325a3f4417211..87172226ffa8ee5b538b30aff2c84ff84aec18c2 100644 (file)
@@ -39,6 +39,7 @@
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_customdata_types.h"
@@ -46,7 +47,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_bpath.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
 #include "BLI_scanfill.h"
@@ -71,7 +71,6 @@
 #include "BLI_edgehash.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_array.h"
 #include "BLI_edgehash.h"
@@ -461,7 +460,7 @@ Mesh *add_mesh(const char *name)
        
        me->size[0]= me->size[1]= me->size[2]= 1.0;
        me->smoothresh= 30;
-       me->texflag= AUTOSPACE;
+       me->texflag= ME_AUTOSPACE;
        me->flag= ME_TWOSIDED;
        me->bb= unit_boundbox();
        me->drawflag= ME_DRAWEDGES|ME_DRAWFACES|ME_DRAWCREASES;
@@ -658,7 +657,7 @@ void tex_space_mesh(Mesh *me)
 
        boundbox_mesh(me, loc, size);
 
-       if(me->texflag & AUTOSPACE) {
+       if (me->texflag & ME_AUTOSPACE) {
                for (a=0; a<3; a++) {
                        if(size[a]==0.0f) size[a]= 1.0f;
                        else if(size[a]>0.0f && size[a]<0.00001f) size[a]= 0.00001f;
@@ -2252,8 +2251,8 @@ int mesh_recalcTesselation(CustomData *fdata,
        MLoop *ml, *mloop;
        MFace *mface = NULL, *mf;
        BLI_array_declare(mface);
-       EditVert *v, *lastv, *firstv;
-       EditFace *f;
+       ScanFillVert *v, *lastv, *firstv;
+       ScanFillFace *f;
        int *mface_orig_index = NULL;
        BLI_array_declare(mface_orig_index);
        int *mface_to_poly_map = NULL;
index 1f154e1749277eaec50990faa2bf0fc336f72966..e7320ddf5dc72d86588afacc60fdf53743834699 100644 (file)
@@ -43,7 +43,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_cdderivedmesh.h"
index 3d8729bc7884462ebe91ecfafb699c72a6edaba8..00aa5d96babbf592137d01ae47fdd888d56ed13b 100644 (file)
@@ -45,6 +45,7 @@
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meta_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_scene_types.h"
@@ -58,7 +59,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_bpath.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
 #include "BLI_utildefines.h"
index 53c7656663a47622d7d53788d4395bcb11d72369..84513f832042a904cc2bf7f573ec91f812952aa6 100644 (file)
@@ -43,7 +43,6 @@
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
index 890a8c8247df5d058be913ee0d8518d87aa9368a..6886e58ebe9309fed229d553735a28d4ee6cb202 100644 (file)
@@ -42,17 +42,46 @@ extern struct ListBase fillvertbase;
 extern struct ListBase filledgebase;
 extern struct ListBase fillfacebase;
 
-struct EditVert;
+struct ScanFillVert;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* note; changing this also might affect the undo copy in editmesh.c */
+typedef struct ScanFillVert
+{
+       struct ScanFillVert *next, *prev;
+       union {
+               struct ScanFillVert *v;
+               void            *p;
+               intptr_t         l;
+       } tmp;
+       float co[3]; /*vertex location */
+       int keyindex; /* original index #, for restoring  key information */
+       short poly_nr;
+       unsigned char f, h;
+} ScanFillVert;
+
+typedef struct ScanFillEdge
+{
+       struct ScanFillEdge *next, *prev;
+       struct ScanFillVert *v1, *v2;
+       short poly_nr;
+       unsigned char f;
+} ScanFillEdge;
+
+typedef struct ScanFillFace
+{
+       struct ScanFillFace *next, *prev;
+       struct ScanFillVert *v1, *v2, *v3;
+} ScanFillFace;
+
 /* scanfill.c: used in displist only... */
-struct EditVert *BLI_addfillvert(float *vec);
-struct EditEdge *BLI_addfilledge(struct EditVert *v1, struct EditVert *v2);
+struct ScanFillVert *BLI_addfillvert(const float vec[3]);
+struct ScanFillEdge *BLI_addfilledge(struct ScanFillVert *v1, struct ScanFillVert *v2);
 
-/* Optionally set EditEdge f to this to mark original boundary edges.
+/* Optionally set ScanFillEdge f to this to mark original boundary edges.
   Only needed if there are internal diagonal edges pased to BLI_edgefill. */
 #define FILLBOUNDARY 1
 
index 55a5be3fbc211a9bdc1e1c721a2e02e61eaf7cad..6e8da84cb2494019fd498413c6f80f307897eca4 100644 (file)
@@ -102,7 +102,6 @@ set(SRC
        BLI_dynlib.h
        BLI_dynstr.h
        BLI_edgehash.h
-       BLI_editVert.h
        BLI_fileops.h
        BLI_fileops_types.h
        BLI_fnmatch.h
index 7652cc4f4af4b3d236d372eeee5d18a7857a0ba6..64beed24fc5af0136e41b60a41c86a8bce38fd41 100644 (file)
@@ -38,7 +38,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_callbacks.h"
-#include "BLI_editVert.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_scanfill.h"
@@ -86,17 +85,17 @@ typedef struct PolyFill {
        short f,nr;
 } PolyFill;
 
-typedef struct ScFillVert {
-       EditVert *v1;
-       EditEdge *first,*last;
-} ScFillVert;
+typedef struct ScanFillVertLink {
+       ScanFillVert *v1;
+       ScanFillEdge *first, *last;
+} ScanFillVertLink;
 
 
 /* local funcs */
 
 #define COMPLIMIT      0.00003
 
-static ScFillVert *scdata;
+static ScanFillVertLink *scdata;
 
 ListBase fillvertbase = {NULL, NULL};
 ListBase filledgebase = {NULL, NULL};
@@ -109,7 +108,7 @@ static int cox, coy;
 
 static int vergscdata(const void *a1, const void *a2)
 {
-       const ScFillVert *x1=a1,*x2=a2;
+       const ScanFillVertLink *x1=a1,*x2=a2;
        
        if( x1->v1->co[coy] < x2->v1->co[coy] ) return 1;
        else if( x1->v1->co[coy] > x2->v1->co[coy]) return -1;
@@ -205,11 +204,11 @@ void BLI_end_edgefill(void)
 
 /* ****  FILL ROUTINES *************************** */
 
-EditVert *BLI_addfillvert(float *vec)
+ScanFillVert *BLI_addfillvert(const float vec[3])
 {
-       EditVert *eve;
+       ScanFillVert *eve;
        
-       eve= mem_element_new(sizeof(EditVert));
+       eve= mem_element_new(sizeof(ScanFillVert));
        BLI_addtail(&fillvertbase, eve);
        
        eve->co[0] = vec[0];
@@ -219,11 +218,11 @@ EditVert *BLI_addfillvert(float *vec)
        return eve;     
 }
 
-EditEdge *BLI_addfilledge(EditVert *v1, EditVert *v2)
+ScanFillEdge *BLI_addfilledge(ScanFillVert *v1, ScanFillVert *v2)
 {
-       EditEdge *newed;
+       ScanFillEdge *newed;
 
-       newed= mem_element_new(sizeof(EditEdge));
+       newed= mem_element_new(sizeof(ScanFillEdge));
        BLI_addtail(&filledgebase, newed);
        
        newed->v1= v1;
@@ -232,19 +231,17 @@ EditEdge *BLI_addfilledge(EditVert *v1, EditVert *v2)
        return newed;
 }
 
-static void addfillface(EditVert *v1, EditVert *v2, EditVert *v3, short mat_nr)
+static void addfillface(ScanFillVert *v1, ScanFillVert *v2, ScanFillVert *v3)
 {
        /* does not make edges */
-       EditFace *evl;
+       ScanFillFace *evl;
 
-       evl= mem_element_new(sizeof(EditFace));
+       evl= mem_element_new(sizeof(ScanFillFace));
        BLI_addtail(&fillfacebase, evl);
        
        evl->v1= v1;
        evl->v2= v2;
        evl->v3= v3;
-       evl->f= 2;
-       evl->mat_nr= mat_nr;
 }
 
 static int boundisect(PolyFill *pf2, PolyFill *pf1)
@@ -273,18 +270,18 @@ static int boundisect(PolyFill *pf2, PolyFill *pf1)
 
 static void mergepolysSimp(PolyFill *pf1, PolyFill *pf2)       /* add pf2 to pf1 */
 {
-       EditVert *eve;
-       EditEdge *eed;
+       ScanFillVert *eve;
+       ScanFillEdge *eed;
 
        /* replace old poly numbers */
        eve= fillvertbase.first;
        while(eve) {
-               if(eve->xs== pf2->nr) eve->xs= pf1->nr;
+               if(eve->poly_nr == pf2->nr) eve->poly_nr = pf1->nr;
                eve= eve->next;
        }
        eed= filledgebase.first;
        while(eed) {
-               if(eed->f1== pf2->nr) eed->f1= pf1->nr;
+               if (eed->poly_nr == pf2->nr) eed->poly_nr = pf1->nr;
                eed= eed->next;
        }
 
@@ -310,10 +307,10 @@ static short testedgeside(float *v1, float *v2, float *v3)
        return 1;
 }
 
-static short addedgetoscanvert(ScFillVert *sc, EditEdge *eed)
+static short addedgetoscanvert(ScanFillVertLink *sc, ScanFillEdge *eed)
 {
        /* find first edge to the right of eed, and insert eed before that */
-       EditEdge *ed;
+       ScanFillEdge *ed;
        float fac,fac1,x,y;
 
        if(sc->first==0) {
@@ -354,12 +351,12 @@ static short addedgetoscanvert(ScFillVert *sc, EditEdge *eed)
 }
 
 
-static ScFillVert *addedgetoscanlist(EditEdge *eed, int len)
+static ScanFillVertLink *addedgetoscanlist(ScanFillEdge *eed, int len)
 {
-       /* inserts edge at correct location in ScFillVert list */
+       /* inserts edge at correct location in ScanFillVertLink list */
        /* returns sc when edge already exists */
-       ScFillVert *sc,scsearch;
-       EditVert *eve;
+       ScanFillVertLink *sc,scsearch;
+       ScanFillVert *eve;
 
        /* which vert is left-top? */
        if(eed->v1->co[coy] == eed->v2->co[coy]) {
@@ -376,8 +373,8 @@ static ScFillVert *addedgetoscanlist(EditEdge *eed, int len)
        }
        /* find location in list */
        scsearch.v1= eed->v1;
-       sc= (ScFillVert *)bsearch(&scsearch,scdata,len,
-               sizeof(ScFillVert), vergscdata);
+       sc= (ScanFillVertLink *)bsearch(&scsearch,scdata,len,
+               sizeof(ScanFillVertLink), vergscdata);
 
        if(sc==0) printf("Error in search edge: %p\n", (void *)eed);
        else if(addedgetoscanvert(sc,eed)==0) return sc;
@@ -385,7 +382,7 @@ static ScFillVert *addedgetoscanlist(EditEdge *eed, int len)
        return 0;
 }
 
-static short boundinsideEV(EditEdge *eed, EditVert *eve)
+static short boundinsideEV(ScanFillEdge *eed, ScanFillVert *eve)
 /* is eve inside boundbox eed */
 {
        float minx,maxx,miny,maxy;
@@ -416,8 +413,8 @@ static void testvertexnearedge(void)
        /* only vertices with ->h==1 are being tested for
                being close to an edge, if true insert */
 
-       EditVert *eve;
-       EditEdge *eed,*ed1;
+       ScanFillVert *eve;
+       ScanFillEdge *eed,*ed1;
        float dist,vec1[2],vec2[2],vec3[2];
 
        eve= fillvertbase.first;
@@ -437,7 +434,7 @@ static void testvertexnearedge(void)
                        }
                        eed= filledgebase.first;
                        while(eed) {
-                               if(eve!=eed->v1 && eve!=eed->v2 && eve->xs==eed->f1) {
+                               if (eve != eed->v1 && eve != eed->v2 && eve->poly_nr == eed->poly_nr) {
                                        if(compare_v3v3(eve->co,eed->v1->co, COMPLIMIT)) {
                                                ed1->v2= eed->v1;
                                                eed->v1->h++;
@@ -462,8 +459,8 @@ static void testvertexnearedge(void)
                                                                ed1= BLI_addfilledge(eed->v1, eve);
                                                                
                                                                /* printf("fill: vertex near edge %x\n",eve); */
-                                                               ed1->f= ed1->h= 0;
-                                                               ed1->f1= eed->f1;
+                                                               ed1->f= 0;
+                                                               ed1->poly_nr = eed->poly_nr;
                                                                eed->v1= eve;
                                                                eve->h= 3;
                                                                break;
@@ -481,8 +478,8 @@ static void testvertexnearedge(void)
 static void splitlist(ListBase *tempve, ListBase *temped, short nr)
 {
        /* everything is in templist, write only poly nr to fillist */
-       EditVert *eve,*nextve;
-       EditEdge *eed,*nexted;
+       ScanFillVert *eve,*nextve;
+       ScanFillEdge *eed,*nexted;
 
        BLI_movelisttolist(tempve,&fillvertbase);
        BLI_movelisttolist(temped,&filledgebase);
@@ -490,7 +487,7 @@ static void splitlist(ListBase *tempve, ListBase *temped, short nr)
        eve= tempve->first;
        while(eve) {
                nextve= eve->next;
-               if(eve->xs==nr) {
+               if (eve->poly_nr == nr) {
                        BLI_remlink(tempve,eve);
                        BLI_addtail(&fillvertbase,eve);
                }
@@ -499,7 +496,7 @@ static void splitlist(ListBase *tempve, ListBase *temped, short nr)
        eed= temped->first;
        while(eed) {
                nexted= eed->next;
-               if(eed->f1==nr) {
+               if(eed->poly_nr==nr) {
                        BLI_remlink(temped,eed);
                        BLI_addtail(&filledgebase,eed);
                }
@@ -508,11 +505,11 @@ static void splitlist(ListBase *tempve, ListBase *temped, short nr)
 }
 
 
-static int scanfill(PolyFill *pf, short mat_nr)
+static int scanfill(PolyFill *pf)
 {
-       ScFillVert *sc = NULL, *sc1;
-       EditVert *eve,*v1,*v2,*v3;
-       EditEdge *eed,*nexted,*ed1,*ed2,*ed3;
+       ScanFillVertLink *sc = NULL, *sc1;
+       ScanFillVert *eve,*v1,*v2,*v3;
+       ScanFillEdge *eed,*nexted,*ed1,*ed2,*ed3;
        float miny = 0.0;
        int a,b,verts, maxface, totface;
        short nr, test, twoconnected=0;
@@ -558,14 +555,14 @@ static int scanfill(PolyFill *pf, short mat_nr)
        }
 
        /* STEP 1: make using FillVert and FillEdge lists a sorted
-               ScFillVert list
+               ScanFillVertLink list
        */
-       sc= scdata= (ScFillVert *)MEM_callocN(pf->verts*sizeof(ScFillVert),"Scanfill1");
+       sc= scdata= (ScanFillVertLink *)MEM_callocN(pf->verts*sizeof(ScanFillVertLink),"Scanfill1");
        eve= fillvertbase.first;
        verts= 0;
        while(eve) {
-               if(eve->xs==nr) {
-                       if(eve->f!= 255) {
+               if (eve->poly_nr == nr) {
+                       if (eve->f != 255) {
                                verts++;
                                eve->f= 0;      /* flag for connectedges later on */
                                sc->v1= eve;
@@ -575,7 +572,7 @@ static int scanfill(PolyFill *pf, short mat_nr)
                eve= eve->next;
        }
 
-       qsort(scdata, verts, sizeof(ScFillVert), vergscdata);
+       qsort(scdata, verts, sizeof(ScanFillVertLink), vergscdata);
 
        eed= filledgebase.first;
        while(eed) {
@@ -698,7 +695,7 @@ static int scanfill(PolyFill *pf, short mat_nr)
                                else {
                                        /* new triangle */
                                        /* printf("add face %x %x %x\n",v1,v2,v3); */
-                                       addfillface(v1, v2, v3, mat_nr);
+                                       addfillface(v1, v2, v3);
                                        totface++;
                                        BLI_remlink((ListBase *)&(sc->first),ed1);
                                        BLI_addtail(&filledgebase,ed1);
@@ -787,8 +784,8 @@ int BLI_edgefill(short mat_nr)
          - returns number of triangle faces added.
        */
        ListBase tempve, temped;
-       EditVert *eve;
-       EditEdge *eed,*nexted;
+       ScanFillVert *eve;
+       ScanFillEdge *eed,*nexted;
        PolyFill *pflist,*pf;
        float limit, *minp, *maxp, *v1, *v2, norm[3], len;
        short a,c,poly=0,ok=0,toggle=0;
@@ -799,7 +796,7 @@ int BLI_edgefill(short mat_nr)
        a = 0;
        while(eve) {
                eve->f= 0;
-               eve->xs= 0;
+               eve->poly_nr= 0;
                eve->h= 0;
                eve= eve->next;
                a += 1;
@@ -808,7 +805,7 @@ int BLI_edgefill(short mat_nr)
        if (a == 3 && (mat_nr & 2)) {
                eve = fillvertbase.first;
 
-               addfillface(eve, eve->next, eve->next->next, 0);
+               addfillface(eve, eve->next, eve->next->next);
                return 1;
        } else if (a == 4 && (mat_nr & 2)) {
                float vec1[3], vec2[3];
@@ -821,15 +818,15 @@ int BLI_edgefill(short mat_nr)
                        sub_v3_v3v3(vec2, eve->next->co, eve->next->next->next->co);
                        
                        if (INPR(vec1, vec1) < INPR(vec2, vec2)) {
-                               addfillface(eve, eve->next, eve->next->next, 0);
-                               addfillface(eve->next->next, eve->next->next->next, eve, 0);
+                               addfillface(eve, eve->next, eve->next->next);
+                               addfillface(eve->next->next, eve->next->next->next, eve);
                        } else{
-                               addfillface(eve->next, eve->next->next, eve->next->next->next, 0);
-                               addfillface(eve->next->next->next, eve, eve->next, 0);
+                               addfillface(eve->next, eve->next->next, eve->next->next->next);
+                               addfillface(eve->next->next->next, eve, eve->next);
                        }
                } else {
-                               addfillface(eve, eve->next, eve->next->next, 0);
-                               addfillface(eve->next->next, eve->next->next->next, eve, 0);
+                               addfillface(eve, eve->next, eve->next->next);
+                               addfillface(eve->next->next, eve->next->next->next, eve);
                }
                return 2;
        }
@@ -838,7 +835,7 @@ int BLI_edgefill(short mat_nr)
        /* including resetting of flags */
        eed= filledgebase.first;
        while(eed) {
-               eed->f1= eed->h= 0;
+               eed->poly_nr= 0;
                eed->v1->f= 1;
                eed->v2->f= 1;
 
@@ -895,11 +892,11 @@ int BLI_edgefill(short mat_nr)
        eve= fillvertbase.first;
        while(eve) {
                /* get first vertex with no poly number */
-               if(eve->xs==0) {
+               if (eve->poly_nr==0) {
                        poly++;
                        /* now a sortof select connected */
                        ok= 1;
-                       eve->xs= poly;
+                       eve->poly_nr = poly;
                        
                        while(ok) {
                                
@@ -909,19 +906,19 @@ int BLI_edgefill(short mat_nr)
                                else eed= filledgebase.last;
 
                                while(eed) {
-                                       if(eed->v1->xs==0 && eed->v2->xs==poly) {
-                                               eed->v1->xs= poly;
-                                               eed->f1= poly;
+                                       if (eed->v1->poly_nr == 0 && eed->v2->poly_nr == poly) {
+                                               eed->v1->poly_nr = poly;
+                                               eed->poly_nr= poly;
                                                ok= 1;
                                        }
-                                       else if(eed->v2->xs==0 && eed->v1->xs==poly) {
-                                               eed->v2->xs= poly;
-                                               eed->f1= poly;
+                                       else if (eed->v2->poly_nr == 0 && eed->v1->poly_nr == poly) {
+                                               eed->v2->poly_nr = poly;
+                                               eed->poly_nr= poly;
                                                ok= 1;
                                        }
-                                       else if(eed->f1==0) {
-                                               if(eed->v1->xs==poly && eed->v2->xs==poly) {
-                                                       eed->f1= poly;
+                                       else if (eed->poly_nr == 0) {
+                                               if (eed->v1->poly_nr == poly && eed->v2->poly_nr == poly) {
+                                                       eed->poly_nr= poly;
                                                        ok= 1;
                                                }
                                        }
@@ -1002,21 +999,21 @@ int BLI_edgefill(short mat_nr)
        }
        eed= filledgebase.first;
        while(eed) {
-               pflist[eed->f1-1].edges++;
+               pflist[eed->poly_nr-1].edges++;
                eed= eed->next;
        }
 
        eve= fillvertbase.first;
        while(eve) {
-               pflist[eve->xs-1].verts++;
-               minp= pflist[eve->xs-1].min;
-               maxp= pflist[eve->xs-1].max;
+               pflist[eve->poly_nr-1].verts++;
+               minp= pflist[eve->poly_nr-1].min;
+               maxp= pflist[eve->poly_nr-1].max;
 
                minp[cox]= (minp[cox])<(eve->co[cox]) ? (minp[cox]) : (eve->co[cox]);
                minp[coy]= (minp[coy])<(eve->co[coy]) ? (minp[coy]) : (eve->co[coy]);
                maxp[cox]= (maxp[cox])>(eve->co[cox]) ? (maxp[cox]) : (eve->co[cox]);
                maxp[coy]= (maxp[coy])>(eve->co[coy]) ? (maxp[coy]) : (eve->co[coy]);
-               if(eve->h>2) pflist[eve->xs-1].f= 1;
+               if(eve->h > 2) pflist[eve->poly_nr-1].f = 1;
 
                eve= eve->next;
        }
@@ -1083,7 +1080,7 @@ int BLI_edgefill(short mat_nr)
        for(a=0;a<poly;a++) {
                if(pf->edges>1) {
                        splitlist(&tempve,&temped,pf->nr);
-                       totfaces += scanfill(pf, mat_nr);
+                       totfaces += scanfill(pf);
                }
                pf++;
        }
index 90efe0b6e444ec8036c2a84c5120f066b85f87e0..a14af6184114f6e5cf1d13d6a671fdcd0ff0057a 100644 (file)
@@ -25,7 +25,6 @@
 #include "BLI_scanfill.h"
 #include "BLI_math.h"
 #include "BLI_array.h"
-#include "BLI_editVert.h"
 #include "BLI_smallhash.h"
 
 #include "bmesh.h"
@@ -159,9 +158,9 @@ void bmesh_triangle_fill_exec(BMesh *bm, BMOperator *op)
        BMOIter siter;
        BMEdge *e;
        BMOperator bmop;
-       EditEdge *eed;
-       EditVert *eve, *v1, *v2;
-       EditFace *efa;
+       ScanFillEdge *eed;
+       ScanFillVert *eve, *v1, *v2;
+       ScanFillFace *efa;
        SmallHash hash;
 
        BLI_smallhash_init(&hash);
@@ -186,7 +185,7 @@ void bmesh_triangle_fill_exec(BMesh *bm, BMOperator *op)
                v1 = BLI_smallhash_lookup(&hash, (uintptr_t)e->v1);
                v2 = BLI_smallhash_lookup(&hash, (uintptr_t)e->v2);
                eed = BLI_addfilledge(v1, v2);
-               eed->tmp.p = e;
+               /* eed->tmp.p = e; */ /* UNUSED */
        }
        
        BLI_edgefill(0);
index e16063b50c6e3d1d8831cb22f8e6be5f26fea86d..28d3fa6e170f068f2996e833cad7094913fc3f43 100644 (file)
@@ -38,6 +38,7 @@
 
 
 #include "DNA_anim_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_meshdata_types.h"
@@ -48,7 +49,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_editVert.h"
 #include "BLI_ghash.h"
 
 #include "BKE_animsys.h"
index a8978a0bbde84897011991bc684da9a9e9a9ed10..f1ea39e45b9b5aef51c74a00f8cf89260a264f30 100644 (file)
@@ -43,7 +43,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_graph.h"
index bb493d3fec48656d02af3e3fe5bc820ae21b99b8..e2b89ba90e1db4e572ea67b6a39fabaff543f2ac 100644 (file)
@@ -53,7 +53,6 @@
 
 
 #ifdef RIGID_DEFORM
-#include "BLI_editVert.h"
 #include "BLI_polardecomp.h"
 #endif
 
index f124823b1068a3f0d2cda91dc25d5264231606d7..29404a6e46aae7a7d53ea1e1638ae51482756f16 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
index bec1403a8dd40eda37790fd22513de178432f6e2..65a34e2d1b3048c1bbd2ed709a084fc1f9d81282 100644 (file)
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
-#include "BLI_editVert.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index 8e56a3574874783615d87905b18241ce2cf7b26c..1b8e90ffce75620a11b17a7db6bb8c60864dda54 100755 (executable)
@@ -54,9 +54,9 @@
 #include "WM_types.h"
 
 #include "DNA_scene_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "BKE_tessmesh.h"
-#include "BLI_editVert.h"
 
 #include "mesh_intern.h"
 
@@ -1802,8 +1802,8 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
        
        for (i = 0; i < totface; i++) {
                SmallHash *hash = &shash;
-               EditFace *efa;
-               EditVert *eve, *lasteve;
+               ScanFillFace *efa;
+               ScanFillVert *eve, *lasteve;
                int j;
                float rndscale = FLT_EPSILON * 25;
                
@@ -1818,7 +1818,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
                for (entry = face_nets[i].first; entry; entry = entry->next) {
                        if (!BLI_smallhash_haskey(hash, (intptr_t)entry->kfe->v1)) {
                                eve = BLI_addfillvert(entry->kfe->v1->v->co);
-                               eve->xs = 0;
+                               eve->poly_nr = 0;
                                rnd_offset_co(eve->co, rndscale);
                                eve->tmp.p = entry->kfe->v1->v;
                                BLI_smallhash_insert(hash, (intptr_t)entry->kfe->v1, eve);
@@ -1826,7 +1826,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
 
                        if (!BLI_smallhash_haskey(hash, (intptr_t)entry->kfe->v2)) {
                                eve = BLI_addfillvert(entry->kfe->v2->v->co);
-                               eve->xs = 0;
+                               eve->poly_nr = 0;
                                rnd_offset_co(eve->co, rndscale);
                                eve->tmp.p = entry->kfe->v2->v;
                                BLI_smallhash_insert(hash, (intptr_t)entry->kfe->v2, eve);
@@ -1837,16 +1837,16 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
                        lasteve = BLI_smallhash_lookup(hash, (intptr_t)entry->kfe->v1);
                        eve = BLI_smallhash_lookup(hash, (intptr_t)entry->kfe->v2);
                        
-                       eve->xs++;
-                       lasteve->xs++;
+                       eve->poly_nr++;
+                       lasteve->poly_nr++;
                }
                
                for (j = 0, entry = face_nets[i].first; entry; entry = entry->next, j++) {
                        lasteve = BLI_smallhash_lookup(hash, (intptr_t)entry->kfe->v1);
                        eve = BLI_smallhash_lookup(hash, (intptr_t)entry->kfe->v2);
                        
-                       if (eve->xs > 1 && lasteve->xs > 1) {
-                               EditEdge *eed;
+                       if (eve->poly_nr > 1 && lasteve->poly_nr > 1) {
+                               ScanFillEdge *eed;
                                eed = BLI_addfilledge(lasteve, eve);
                                if (entry->kfe->oe)
                                        eed->f = FILLBOUNDARY;  /* mark as original boundary edge */
@@ -1855,9 +1855,9 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
                                BMO_elem_flag_disable(bm, entry->kfe->e->v2, DEL);
                        }
                        else {
-                               if (lasteve->xs < 2)
+                               if (lasteve->poly_nr < 2)
                                        BLI_remlink(&fillvertbase, lasteve);
-                               if (eve->xs < 2)
+                               if (eve->poly_nr < 2)
                                        BLI_remlink(&fillvertbase, eve);
                        }
                }
index 59861d674f286f82b23fc841b74539c17d69b07b..794356510aa9c7255c719f7b590c0d465f6516ab 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "DNA_ID.h"
 #include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
@@ -50,7 +51,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_dynstr.h" /*for WM_operator_pystring */
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_blender.h"
index 0d7d6ca810819d2464df301bfb9f9274ada4f823..c35bf8988b7d08d0630df54718ac240533f89ad7 100644 (file)
@@ -36,6 +36,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -44,7 +45,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_array.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_edgehash.h"
 #include "BLI_utildefines.h"
 
index 58ad32fad4dc3b12d7b04322732190036cbc7e35..6b0ed5c14d6ee752e5fb897ae558e5af11b33429 100644 (file)
@@ -90,31 +90,6 @@ float labda_PdistVL2Dfl(const float v1[3], const float v2[3], const float v3[3])
 
 /* ******************** editface.c */
 
-#if 0 /* REMOVE AFTER BMESH MERGE */
-
-/* ******************* editmesh.c */
-
-extern void free_editvert(EditMesh *em, EditVert *eve);
-extern void free_editedge(EditMesh *em, EditEdge *eed);
-extern void free_editface(EditMesh *em, EditFace *efa);
-
-/*frees dst mesh, then copies the contents of 
-  *src (the struct) to dst. */
-void set_editMesh(EditMesh *dst, EditMesh *src);
-
-extern void free_vertlist(EditMesh *em, ListBase *edve);
-extern void free_edgelist(EditMesh *em, ListBase *lb);
-extern void free_facelist(EditMesh *em, ListBase *lb);
-
-extern void remedge(EditMesh *em, EditEdge *eed);
-
-extern struct EditVert *addvertlist(EditMesh *em, float *vec, struct EditVert *example);
-extern struct EditEdge *addedgelist(EditMesh *em, struct EditVert *v1, struct EditVert *v2, struct EditEdge *example);
-extern struct EditFace *addfacelist(EditMesh *em, struct EditVert *v1, struct EditVert *v2, struct EditVert *v3, struct EditVert *v4, struct EditFace *example, struct EditFace *exampleEdges);
-extern struct EditEdge *findedgelist(EditMesh *em, struct EditVert *v1, struct EditVert *v2);
-
-#endif
-
 void em_setup_viewcontext(struct bContext *C, struct ViewContext *vc);
 
 void MESH_OT_separate(struct wmOperatorType *ot);
@@ -137,58 +112,6 @@ void MESH_OT_duplicate(struct wmOperatorType *ot);
 void MESH_OT_fgon_make(struct wmOperatorType *ot);
 void MESH_OT_fgon_clear(struct wmOperatorType *ot);
 
-#if 0 /* REMOVE AFTER BMESH MERGE */
-
-/* ******************* editmesh_lib.c */
-void EM_stats_update(EditMesh *em);
-
-extern void EM_fgon_flags(EditMesh *em);
-extern void EM_hide_reset(EditMesh *em);
-
-extern int faceselectedOR(EditFace *efa, int flag);
-extern int faceselectedAND(EditFace *efa, int flag);
-
-void EM_remove_selection(EditMesh *em, void *data, int type);
-void EM_clear_flag_all(EditMesh *em, int flag);
-void EM_set_flag_all(EditMesh *em, int flag);
-void EM_set_flag_all_selectmode(EditMesh *em, int flag);
-
-void EM_data_interp_from_verts(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *eve, float fac);
-void EM_data_interp_from_faces(EditMesh *em, EditFace *efa1, EditFace *efa2, EditFace *efan, int i1, int i2, int i3, int i4);
-
-int EM_nvertices_selected(EditMesh *em);
-int EM_nedges_selected(EditMesh *em);
-int EM_nfaces_selected(EditMesh *em);
-
-float EM_face_perimeter(EditFace *efa);
-
-void EM_store_selection(EditMesh *em, void *data, int type);
-
-extern EditFace *exist_face(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4);
-extern void flipface(EditMesh *em, EditFace *efa); // flips for normal direction
-extern int compareface(EditFace *vl1, EditFace *vl2);
-
-/* flag for selection bits, *nor will be filled with normal for extrusion constraint */
-/* return value defines if such normal was set */
-extern short extrudeflag_face_indiv(EditMesh *em, short flag, float *nor);
-extern short extrudeflag_verts_indiv(EditMesh *em, short flag, float *nor);
-extern short extrudeflag_edges_indiv(EditMesh *em, short flag, float *nor);
-extern short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor, int all);
-extern short extrudeflag(Object *obedit, EditMesh *em, short flag, float *nor, int all);
-
-extern void adduplicateflag(EditMesh *em, int flag);
-extern void delfaceflag(EditMesh *em, int flag);
-
-extern void rotateflag(EditMesh *em, short flag, float *cent, float rotmat[][3]);
-extern void translateflag(EditMesh *em, short flag, float *vec);
-
-extern int convex(float *v1, float *v2, float *v3, float *v4);
-
-extern struct EditFace *EM_face_from_faces(EditMesh *em, struct EditFace *efa1,
-                                                                                  struct EditFace *efa2, int i1, int i2, int i3, int i4);
-
-#endif
-
 extern int EM_view3d_poll(struct bContext *C);
 
 struct wmKeyMap* knifetool_modal_keymap(struct wmKeyConfig *keyconf);
index 99947cb9ae21dadafa26b895175f4172806a2d54..cb4f7a37130414fa378c42ef3de433a4b52a8846 100644 (file)
@@ -48,7 +48,6 @@
 #include "BKE_report.h"
 #include "BKE_tessmesh.h"
 
-#include "BLI_editVert.h"
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 #include "BLI_math_vector.h"
index 4bc500fcdabe668628ed40133ed13216779128a0..c3f749b2c4560b711cb3f2e518a8ee51e633d8f6 100644 (file)
@@ -38,7 +38,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 
 #include "BKE_context.h"
 
index 1b5011402fc9d83f360d53a0a582fdf291d99865..bad0718c6130be56420f822da836875a51b2cafe 100644 (file)
@@ -41,6 +41,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_key_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"
@@ -50,7 +51,6 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
-#include "BLI_editVert.h"
 #include "BLI_ghash.h"
 #include "BLI_rand.h" /* for randome face sorting */
 #include "BLI_threads.h"
index a28b5c4feaaea1756a65b3a00db7d3e929483b8e..b0d99ddd788435d44e14d12d02a325e3b7fb9b89 100644 (file)
@@ -40,7 +40,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_editVert.h"
 #include "BLI_ghash.h"
 #include "BLI_rand.h"
 
@@ -56,6 +55,7 @@
 #include "DNA_object_force.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_vfont_types.h"
+#include "DNA_mesh_types.h"
 
 #include "IMB_imbuf_types.h"
 
index 2083c51efa9117387416d78e7b1a1f0e6c4934fc..8b5a9ae6c9bec9923e6a644ac93403e75f15ef13 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index e8a09732313bed67d74a5949d003cca5a9b6dcee..547c5b2477829812a7dffdc0ab2b0b49926f2884 100644 (file)
@@ -46,7 +46,6 @@
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_path_util.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
index f64f25391f92941167cd5e4d56c63847ac9efad3..1a226112db4502a702bf9e46a409de898335a770 100644 (file)
@@ -35,6 +35,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_anim_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_group_types.h"
 #include "DNA_lamp_types.h"
@@ -48,7 +49,6 @@
 #include "DNA_object_types.h"
 
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
index 68c017adecd2f1a75794f56068df9448d3469aed..aac8ef4c5e3f67bb54c1a9f5e39c039788172156 100644 (file)
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_group_types.h"
 
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
index 78d90bb39d292010d41dee9fa244c105fc71eeee..bad89b5b137b62b4002b7204691966bb1a9f9b76 100644 (file)
@@ -207,13 +207,13 @@ static int ED_vgroup_give_parray(ID *id, MDeformVert ***dvert_arr, int *dvert_to
                                        if (use_vert_sel) {
                                                BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
                                                        (*dvert_arr)[i] = BM_elem_flag_test(eve, BM_ELEM_SELECT) ?
-                                                                         CustomData_em_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT) : NULL;
+                                                                         CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT) : NULL;
                                                        i++;
                                                }
                                        }
                                        else {
                                                BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
-                                                       (*dvert_arr)[i] = CustomData_em_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT);
+                                                       (*dvert_arr)[i] = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT);
                                                        i++;
                                                }
                                        }
index 13383445c9321754f1828914c8344e42aaf71d7b..4b4d73548980f087ebf440e545f537a84aadb92c 100644 (file)
@@ -37,7 +37,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_dlrbTree.h"
 #include "BLI_utildefines.h"
 #include "BLI_jitter.h"
index 83b4dfef6c67c8685e3537bb1f6c84105f7ced76..dd7038716c499083c93120eafe0389aa0c098405 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
@@ -43,7 +44,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
index 22bac3a669929fa6b37e424b9557d14b8ba25429..039b1c2f866cc8ad114c47470d456152dd1e7788 100644 (file)
@@ -34,7 +34,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_dlrbTree.h"
 #include "BLI_utildefines.h"
 
@@ -44,6 +43,7 @@
 #include "DNA_curve_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_meta_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_userdef_types.h"
 
 #include "BKE_context.h"
index 681ab3a149294cbfd60a7454df71e1fbf6746839..980a6b44e4e4d5bc6d838bd98b6b2147d2cbab9f 100644 (file)
@@ -50,7 +50,6 @@
 #include "BLI_memarena.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
-#include "BLI_editVert.h"
 
 #include "PIL_time.h"
 
index 2bff8476ea98b7619056eb02ba4b1098a5d2e293..8c8c2da17123f2dc85df6ada2a02c3f307f6020e 100644 (file)
@@ -42,9 +42,9 @@
 #include "BLI_ghash.h"
 #include "BLI_pbvh.h"
 #include "BLI_threads.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
index ce07beae674033665d64eecd75cc0409fd0e8ba8..11e926fb065550b789beb2ac0a862e195949960f 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_brush_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
 #include "BKE_brush.h"
index 9e1ff82c20d32e4cc29eb11eaf3982e762cf76df..e2ea6849a724c419ae30b6f2f508dbe0fa57f3af 100644 (file)
@@ -42,7 +42,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
index e7dc5e8408cf92dc5bfc8732b4094089a669ec14..8925866df8d8a1c892fbb8535d09eb9274256cb1 100644 (file)
@@ -42,7 +42,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 
 #include "BKE_context.h"
index 43bea1c311d58051d65211bc11b17a6f40a9a679..150872813b2ba5b6d7fe1087104be4c19fa0c60d 100644 (file)
@@ -41,7 +41,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
index dd988c94dc95d817c67b09b575159dbffb160861..ce7338ced13b89331084389ba13dc1199fcd3d69 100644 (file)
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -40,7 +41,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
index 38d99c084b316c8c28953fb568caf1dff3a33469..cf003d8c1eb29d4f8812290f5f44660ca7bac38f 100644 (file)
@@ -34,6 +34,7 @@
 #include "DNA_curve_types.h"
 #include "DNA_group_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_scene_types.h"
 
@@ -53,7 +54,6 @@
 #include "ED_armature.h"
 #include "ED_mesh.h"
 
-#include "BLI_editVert.h"
 
 typedef struct SceneStats {
        int totvert, totvertsel;
index 79d11c956cdc1f32d444a264563741ec7186b8ae..fc42d9fa966eb95a34432b1cc59431165ed5b0ce 100644 (file)
@@ -42,7 +42,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 
 #include "BLF_translation.h"
index 09a4a9eb74902fcefa5cb70866d65635de20db6c..ca647d9962a37678502a36263a9089ddbd870ca2 100644 (file)
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
index 8baba5a1ee28dfa9a95839059639ae8d2b4aec73..1ef2226941eab60c6d60106e5a3d8895605c3719 100644 (file)
@@ -39,6 +39,7 @@
 #include "DNA_lamp_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_scene_types.h"
@@ -50,7 +51,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_edgehash.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
index 61b4260450b3b2106cae97e2bde74396d1842ba0..2ab4491baa28eebef47ec6becf2d8e844dde9ca2 100644 (file)
@@ -41,7 +41,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_edgehash.h"
 #include "BLI_rand.h"
 
index 98301e63705b114f6a577c04ef96f93f33455928..351450641696d34342f070037c268c6d64d09e54 100644 (file)
@@ -38,6 +38,7 @@
 #include "DNA_curve_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_meta_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -46,7 +47,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
index 0a942a42540bf82e1f758a0bc06be000f9297074..9bbf4744b8c7403c8bd7e848ca84efa4523353b5 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 
 #include "RNA_access.h"
 
@@ -42,7 +43,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BLF_translation.h"
index ec6d1bdbe873cce49711f2bc0535f96d0b51ffd4..079db789a3c34e35da6e053e79e1b0f8d91e7cce 100644 (file)
@@ -39,6 +39,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_meta_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -48,7 +49,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_linklist.h"
 #include "BLI_utildefines.h"
index 087ed8380d6d8ec615ae519cc291717220c13401..9d2f549458f925bec0d8ceee252b4c6ae39e3a35 100644 (file)
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_linklist.h"
 #include "BLI_utildefines.h"
 
index 86a2abe7a746c3eac5af3a57eb3d145ea1edbf7a..e14946da28a5c888be19bbcf4b5ffe33dbd474ad 100644 (file)
@@ -41,7 +41,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
index d15d6b8b3bcea009f90f7fd0a7c8e80829092524..dfdbf852305309d5bcca132ad9ac9242971bff69 100644 (file)
@@ -47,6 +47,7 @@
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_scene_types.h"           /* PET modes                    */
@@ -81,7 +82,6 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
-#include "BLI_editVert.h"
 #include "BLI_ghash.h"
 #include "BLI_linklist.h"
 #include "BLI_smallhash.h"
index 13f7d279da97d64fb2b89f18385f5894ffe467c6..0226ccc493869708f57020311914f7e9cbfa9569 100644 (file)
@@ -38,7 +38,6 @@
 
 #include "DNA_listBase.h"
 
-#include "BLI_editVert.h"
 #include "BLI_smallhash.h"
 #include "BKE_tessmesh.h"
 
index 5158f2beada7d41c493a794946efae23012684c5..abbe2db9f1975a5eed6c4e9dd4e89dc444edae51 100644 (file)
@@ -41,6 +41,7 @@
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_node_types.h"
 #include "DNA_screen_types.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_array.h"
 #include "BLI_utildefines.h"
 #include "BLI_smallhash.h"
@@ -290,7 +290,7 @@ static void createTransTexspace(TransInfo *t)
 
        if (give_obdata_texspace(ob, &texflag, &td->loc, &td->ext->size, &td->ext->rot)) {
                ob->dtx |= OB_TEXSPACE;
-               *texflag &= ~AUTOSPACE;
+               *texflag &= ~ME_AUTOSPACE;
        }
 
        copy_v3_v3(td->iloc, td->loc);
index 4073081ffc2f870c79dbecda818db8c282ed734b..8013520639eaa14b3a6caf4406df2bd9a588a7c4 100644 (file)
@@ -44,6 +44,7 @@
 #include "DNA_space_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_modifier_types.h"
@@ -92,7 +93,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
index f95856b23733801bd3c8270efc374d46c89da56a..67a0d5dbe04befbcfc149da54695fac4e026e603 100644 (file)
@@ -46,6 +46,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_scene_types.h"
@@ -63,7 +64,6 @@
 #include "BKE_tessmesh.h"
 
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BIF_gl.h"
index 33f3ad45a08263d8a00efdae98f26d25bf89b886..5f83bb4c29cd718dd47c00ec66671f669d18b71a 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
@@ -46,7 +47,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BLF_translation.h"
index 183ade56cf007a52e03c909da6cabd088d0698f9..d08c7f65e2dfa836cf719f116ed25e641942273c 100644 (file)
@@ -40,6 +40,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h" // Temporary, for snapping to other unselected meshes
 #include "DNA_space_types.h"
 #include "DNA_screen_types.h"
@@ -49,7 +50,6 @@
 #include "RNA_access.h"
 
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
index ae4f99414bdd99178d32923da152b7e0678d8efa..5ead0959d5c9630887d4fd1d19a6308fa4ccb265 100644 (file)
@@ -35,6 +35,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_modifier_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
 #include "BKE_DerivedMesh.h"
@@ -45,7 +46,6 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 
 #include "ED_util.h"
 
index 7f301123ab8a775ea7e1482867fbad2194f3a114..61b1dece95775698435b39cb49af0f01af31bbea 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_packedFile_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 56a835beeb8db3e5364ca3eb76b6d0bacc282129..6ab68d2261e5f898ddbeb16f80e5d44acf86aa4b 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_dynstr.h"
 #include "BLI_utildefines.h"
 
index 9759ab447f6a8afbef93a8913e8302e3f13a696b..20ff8b07bc6615de2e6ca9917e46d0b6a72034f0 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -40,7 +41,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
index ca8f1e4fb9736c326207fc8d4daceda2aba0a06b..8de03f330d9925acad670f766b342e8761e3ab47 100644 (file)
@@ -43,7 +43,6 @@
 #include "DNA_space_types.h"
 
 #include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.h"
index 0df2a70302a91168a31567b26b55d184a131cdaf..df1c9c48f99f2fccf395a97966f807de2f26ccbb 100644 (file)
@@ -39,6 +39,7 @@
 
 #include "DNA_object_types.h"
 #include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_node_types.h"
 #include "DNA_image_types.h"
@@ -47,7 +48,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"
 #include "BLI_array.h"
 #include "BLI_utildefines.h"
 
index 70971e43409d17d368eaeeb1c0363eb371ed8b9e..b63cb458c0ab4629dc6dd7820fe4a07a1301cf7c 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 
-#include "BLI_editVert.h"
 #include "BLI_ghash.h"
 #include "BLI_math.h"
 #include "BLI_math_vector.h"
index 6d15d023fbebf6db83546a4ee7ac3d0242af8761..c2bcb2908656df2bdee1caf06e2796ac8b589f67 100644 (file)
@@ -37,6 +37,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_camera_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -45,7 +46,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
-#include "BLI_editVert.h"
 #include "BLI_uvproject.h"
 #include "BLI_utildefines.h"
 #include "BLI_rand.h"
@@ -64,7 +64,6 @@
 
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
-#include "BLI_editVert.h"
 #include "BLI_scanfill.h"
 #include "BLI_array.h"
 #include "BLI_uvproject.h"
@@ -213,8 +212,8 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em,
        BM_mesh_elem_index_ensure(em->bm, BM_VERT);
        
        BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
-               EditVert *v, *lastv, *firstv;
-               EditFace *sefa;
+               ScanFillVert *v, *lastv, *firstv;
+               ScanFillFace *sefa;
                ParamKey key, vkeys[4];
                ParamBool pin[4], select[4];
                BMLoop *ls[3];
@@ -226,7 +225,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em,
                if((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) || (sel && BM_elem_flag_test(efa, BM_ELEM_SELECT)==0))
                        continue;
 
-               /* tf= (MTexPoly *)CustomData_em_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */
+               /* tf= (MTexPoly *)CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */
                lsel = 0;
 
                BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
@@ -414,7 +413,7 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, BMEditMesh *e
        numOfEdges = derivedMesh->getNumEdges(derivedMesh);
        numOfFaces = derivedMesh->getNumTessFaces(derivedMesh);
 
-       faceMap = MEM_mallocN(numOfFaces*sizeof(EditFace *), "unwrap_edit_face_map");
+       faceMap = MEM_mallocN(numOfFaces*sizeof(BMFace *), "unwrap_edit_face_map");
 
        BM_mesh_elem_index_ensure(em->bm, BM_VERT);
        EDBM_init_index_arrays(em, 0, 1, 1);
@@ -423,7 +422,7 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, BMEditMesh *e
        for(i = 0; i < numOfFaces; i++)
                faceMap[i] = EDBM_get_face_for_index(em, origFaceIndices[i]);
 
-       edgeMap = MEM_mallocN(numOfEdges*sizeof(EditEdge *), "unwrap_edit_edge_map");
+       edgeMap = MEM_mallocN(numOfEdges*sizeof(BMEdge *), "unwrap_edit_edge_map");
 
        /* map subsurfed edges to original editEdges */
        for(i = 0; i < numOfEdges; i++) {
index 056ae628c79c8d678ecef40bfa6122075271d236..ae9a68fac18b717217d986a37175fc030caa6acb 100644 (file)
@@ -143,7 +143,7 @@ typedef struct TFace {
 /* **************** MESH ********************* */
 
 /* texflag */
-#define AUTOSPACE      1
+#define ME_AUTOSPACE   1
 
 /* me->editflag */
 #define ME_EDIT_MIRROR_X (1 << 0)
index bab9ed60f165c8f7ba960ca56bd0d52372ed6f63..4f5fc2a59ced26478ac5f78afef561c6593bfbd0 100644 (file)
@@ -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);
index 6bcd8c0a5bcfecfccd9baba60d6867901bc0f76a..728ea7c59a6f1fd2b3c86ce63ae2a95b0723e0d0 100644 (file)
@@ -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"
index a5eb610dd2926da7a489f49ec1a60f4f3710ceb3..ed443f47eb3659be43caad56e44fe35687c664a0 100644 (file)
@@ -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"
index e3ae8f52b1530b32d3604a239ff79883e421ce44..8483478838d04d0b8c1bed5798174b172bf98e6d 100644 (file)
@@ -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"
index f785f112ccbab496c9cc53b4c227f7ea5e5c0060..ec9b2b80d8301e8eb5994641e1d1126ead111e17 100644 (file)
@@ -30,7 +30,6 @@
 
 #define DO_PROFILE 0
 
-#include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
index c97d2b5859697e9d0637a63b3112b424959d8af1..e72a2d2427a0c91a5c7fb7890ffe6c84a625b8de 100644 (file)
@@ -37,7 +37,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_editVert.h"      /* lasso tessellation */
 #include "BLI_math.h"
 #include "BLI_scanfill.h"      /* lasso tessellation */
 #include "BLI_utildefines.h"
@@ -230,9 +229,9 @@ static void wm_gesture_draw_circle(wmGesture *gt)
 
 static void draw_filled_lasso(wmGesture *gt)
 {
-       EditVert *v=NULL, *lastv=NULL, *firstv=NULL;
+       ScanFillVert *v=NULL, *lastv=NULL, *firstv=NULL;
        /* EditEdge *e; */ /* UNUSED */
-       EditFace *efa;
+       ScanFillFace *efa;
        short *lasso= (short *)gt->customdata;
        int i;