diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-15 04:15:24 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-15 04:15:24 +0400 |
| commit | 41729976753523ee08a0afaf6a26b6caf3dee1d6 (patch) | |
| tree | ba264fba22084f44eb50b952f375715f501acff9 /source/blender/makesdna/DNA_mesh_types.h | |
| parent | a5f8298ea5d13d7707bc0cbf0722013276bab9d6 (diff) | |
| parent | a425790065fedb2ae49f1b79770945d8528790d9 (diff) | |
Merged changes in the trunk up to revision 50607.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 316b90b69de..5408e865ab2 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -92,7 +92,8 @@ typedef struct Mesh { struct MCol *mcol; struct MSticky *msticky; struct Mesh *texcomesh; - + + /* When the object is available, the preferred access method is: BMEdit_FromObject(ob) */ struct BMEditMesh *edit_btmesh; /* not saved in file! */ struct CustomData vdata, edata, fdata; |