Revision: 44267 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44267 Author: campbellbarton Date: 2012-02-19 22:17:30 +0000 (Sun, 19 Feb 2012) Log Message: ----------- - remove some unused editmesh functions. - copy & rename EditMesh stricts for use with scanfill (remove unused members)
Modified Paths: -------------- trunk/blender/source/blender/blenkernel/BKE_bmesh.h trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h trunk/blender/source/blender/blenkernel/BKE_context.h trunk/blender/source/blender/blenkernel/BKE_customdata.h trunk/blender/source/blender/blenkernel/BKE_displist.h trunk/blender/source/blender/blenkernel/BKE_modifier.h trunk/blender/source/blender/blenkernel/BKE_subsurf.h trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c trunk/blender/source/blender/blenkernel/intern/anim.c trunk/blender/source/blender/blenkernel/intern/bvhutils.c trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c trunk/blender/source/blender/blenkernel/intern/constraint.c trunk/blender/source/blender/blenkernel/intern/customdata.c trunk/blender/source/blender/blenkernel/intern/displist.c trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c trunk/blender/source/blender/blenkernel/intern/key.c trunk/blender/source/blender/blenkernel/intern/mesh.c trunk/blender/source/blender/blenkernel/intern/multires.c trunk/blender/source/blender/blenkernel/intern/object.c trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c trunk/blender/source/blender/blenlib/BLI_scanfill.h trunk/blender/source/blender/blenlib/CMakeLists.txt trunk/blender/source/blender/blenlib/intern/scanfill.c trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c trunk/blender/source/blender/editors/armature/editarmature.c trunk/blender/source/blender/editors/armature/editarmature_retarget.c trunk/blender/source/blender/editors/armature/meshlaplacian.c trunk/blender/source/blender/editors/mesh/bmesh_utils.c trunk/blender/source/blender/editors/mesh/editface.c trunk/blender/source/blender/editors/mesh/knifetool.c trunk/blender/source/blender/editors/mesh/loopcut.c trunk/blender/source/blender/editors/mesh/mesh_data.c trunk/blender/source/blender/editors/mesh/mesh_intern.h trunk/blender/source/blender/editors/mesh/mesh_navmesh.c trunk/blender/source/blender/editors/mesh/mesh_ops.c trunk/blender/source/blender/editors/mesh/meshtools.c trunk/blender/source/blender/editors/object/object_edit.c trunk/blender/source/blender/editors/object/object_hook.c trunk/blender/source/blender/editors/object/object_modifier.c trunk/blender/source/blender/editors/object/object_relations.c trunk/blender/source/blender/editors/object/object_transform.c trunk/blender/source/blender/editors/object/object_vgroup.c trunk/blender/source/blender/editors/render/render_opengl.c trunk/blender/source/blender/editors/render/render_shading.c trunk/blender/source/blender/editors/screen/screen_ops.c trunk/blender/source/blender/editors/sculpt_paint/paint_image.c trunk/blender/source/blender/editors/sculpt_paint/sculpt.c trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c trunk/blender/source/blender/editors/space_graph/graph_buttons.c trunk/blender/source/blender/editors/space_graph/graph_utils.c trunk/blender/source/blender/editors/space_image/image_buttons.c trunk/blender/source/blender/editors/space_image/space_image.c trunk/blender/source/blender/editors/space_info/info_stats.c trunk/blender/source/blender/editors/space_nla/nla_buttons.c trunk/blender/source/blender/editors/space_view3d/drawmesh.c trunk/blender/source/blender/editors/space_view3d/drawobject.c trunk/blender/source/blender/editors/space_view3d/drawvolume.c trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c trunk/blender/source/blender/editors/space_view3d/view3d_header.c trunk/blender/source/blender/editors/space_view3d/view3d_select.c trunk/blender/source/blender/editors/space_view3d/view3d_snap.c trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c trunk/blender/source/blender/editors/transform/transform.c trunk/blender/source/blender/editors/transform/transform.h trunk/blender/source/blender/editors/transform/transform_conversions.c trunk/blender/source/blender/editors/transform/transform_generics.c trunk/blender/source/blender/editors/transform/transform_manipulator.c trunk/blender/source/blender/editors/transform/transform_orientations.c trunk/blender/source/blender/editors/transform/transform_snap.c trunk/blender/source/blender/editors/util/crazyspace.c trunk/blender/source/blender/editors/util/ed_util.c trunk/blender/source/blender/editors/util/undo.c trunk/blender/source/blender/editors/uvedit/uvedit_buttons.c trunk/blender/source/blender/editors/uvedit/uvedit_draw.c trunk/blender/source/blender/editors/uvedit/uvedit_ops.c trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c trunk/blender/source/blender/makesdna/DNA_mesh_types.h trunk/blender/source/blender/makesrna/intern/rna_mesh.c trunk/blender/source/blender/makesrna/intern/rna_modifier.c trunk/blender/source/blender/makesrna/intern/rna_object.c trunk/blender/source/blender/makesrna/intern/rna_scene.c trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c trunk/blender/source/blender/windowmanager/intern/wm_gesture.c Modified: trunk/blender/source/blender/blenkernel/BKE_bmesh.h =================================================================== --- trunk/blender/source/blender/blenkernel/BKE_bmesh.h 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/BKE_bmesh.h 2012-02-19 22:17:30 UTC (rev 44267) @@ -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 @@ 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 Modified: trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h =================================================================== --- trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/BKE_cdderivedmesh.h 2012-02-19 22:17:30 UTC (rev 44267) @@ -39,7 +39,6 @@ struct DerivedMesh; struct BMEditMesh; -struct EditMesh; struct Mesh; struct Object; Modified: trunk/blender/source/blender/blenkernel/BKE_context.h =================================================================== --- trunk/blender/source/blender/blenkernel/BKE_context.h 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/BKE_context.h 2012-02-19 22:17:30 UTC (rev 44267) @@ -39,7 +39,6 @@ struct ARegion; struct bScreen; -struct EditMesh; struct ListBase; struct Main; struct Object; Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h =================================================================== --- trunk/blender/source/blender/blenkernel/BKE_customdata.h 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/BKE_customdata.h 2012-02-19 22:17:30 UTC (rev 44267) @@ -178,13 +178,9 @@ 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_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_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 @@ */ 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 @@ /* 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); Modified: trunk/blender/source/blender/blenkernel/BKE_displist.h =================================================================== --- trunk/blender/source/blender/blenkernel/BKE_displist.h 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/BKE_displist.h 2012-02-19 22:17:30 UTC (rev 44267) @@ -63,7 +63,6 @@ struct Material; struct Bone; struct Mesh; -struct EditMesh; struct DerivedMesh; /* used for curves, nurbs, mball, importing */ Modified: trunk/blender/source/blender/blenkernel/BKE_modifier.h =================================================================== --- trunk/blender/source/blender/blenkernel/BKE_modifier.h 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/BKE_modifier.h 2012-02-19 22:17:30 UTC (rev 44267) @@ -35,7 +35,6 @@ #include "BKE_customdata.h" struct ID; -struct EditMesh; struct DerivedMesh; struct DagForest; struct DagNode; Modified: trunk/blender/source/blender/blenkernel/BKE_subsurf.h =================================================================== --- trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2012-02-19 22:17:30 UTC (rev 44267) @@ -34,7 +34,6 @@ struct DMGridAdjacency; struct DMGridData; struct DerivedMesh; -struct EditMesh; struct IndexNode; struct ListBase; struct Mesh; Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-02-19 22:17:30 UTC (rev 44267) @@ -37,13 +37,13 @@ #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 @@ 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) { Modified: trunk/blender/source/blender/blenkernel/intern/anim.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-02-19 22:17:30 UTC (rev 44267) @@ -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" Modified: trunk/blender/source/blender/blenkernel/intern/bvhutils.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2012-02-19 22:17:30 UTC (rev 44267) @@ -36,7 +36,6 @@ #include "DNA_meshdata_types.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BLI_linklist.h" Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-02-19 21:15:12 UTC (rev 44266) +++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-02-19 22:17:30 UTC (rev 44267) @@ -43,12 +43,10 @@ #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 @@ 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 */ @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs