diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/blenkernel/BKE_tessmesh.h | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/blenkernel/BKE_tessmesh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_tessmesh.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_tessmesh.h b/source/blender/blenkernel/BKE_tessmesh.h index 947b980bb75..d9d2c21e2b3 100644 --- a/source/blender/blenkernel/BKE_tessmesh.h +++ b/source/blender/blenkernel/BKE_tessmesh.h @@ -61,7 +61,7 @@ typedef struct BMEditMesh { int lastDataMask; /* index tables, to map indices to elements via - * EDBM_init_index_arrays and associated functions. don't + * EDBM_index_arrays_init and associated functions. don't * touch this or read it directly.*/ struct BMVert **vert_index; struct BMEdge **edge_index; @@ -80,10 +80,6 @@ typedef struct BMEditMesh { int mirr_free_arrays; } BMEditMesh; -/* undo triggers editmesh tessface update, this is odd but works OK. - * BMESH_TODO, look into having the update elsewhere. */ -#define BMESH_EM_UNDO_RECALC_TESSFACE_WORKAROUND - void BMEdit_RecalcTessellation(BMEditMesh *tm); BMEditMesh *BMEdit_Create(BMesh *bm, int do_tessellate); BMEditMesh *BMEdit_Copy(BMEditMesh *tm); |