diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-09 08:06:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-09 08:06:48 +0400 |
commit | 5a2a3d7d82933be392d8a24937b230b2ab4d7af7 (patch) | |
tree | bff60a2b1c14afb3917ff66e0e1354052a411208 /source/blender/blenkernel/BKE_tessmesh.h | |
parent | 14a2330d7b4edbb294b77072f99283cdd0fa6bae (diff) |
more syncing with trunk, also cleared many warnings with gcc4.6
Diffstat (limited to 'source/blender/blenkernel/BKE_tessmesh.h')
-rw-r--r-- | source/blender/blenkernel/BKE_tessmesh.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_tessmesh.h b/source/blender/blenkernel/BKE_tessmesh.h index f2827747555..601d95de268 100644 --- a/source/blender/blenkernel/BKE_tessmesh.h +++ b/source/blender/blenkernel/BKE_tessmesh.h @@ -50,9 +50,8 @@ typedef struct BMEditMesh { struct BMFace **face_index; /*selection mode*/ - int selectmode; - - int mat_nr; + short selectmode; + short mat_nr; /*Mesh structure this editmesh came from, if it came from one*/ struct Mesh *me; @@ -69,4 +68,4 @@ BMEditMesh *BMEdit_Copy(BMEditMesh *tm); void BMEdit_Free(BMEditMesh *em); void BMEdit_UpdateLinkedCustomData(BMEditMesh *em); -#endif /* _BKE_TESSMESH_H */
\ No newline at end of file +#endif /* _BKE_TESSMESH_H */ |