diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-14 14:38:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-14 14:38:11 +0400 |
| commit | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (patch) | |
| tree | 78aa22e116cf7aed6d10d851978a5bdcf807fa84 /source/blender/makesdna/DNA_mesh_types.h | |
| parent | 5f02b167d191969474c8f3575abdd6dbaeffeb57 (diff) | |
| parent | 9a79bd38ade00fc663c27ffda9892629ef5ca755 (diff) | |
Merged changes in the trunk up to revision 45619.
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index eac6fc0d5e0..316b90b69de 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -67,6 +67,7 @@ typedef struct Mesh { struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ struct Key *key; struct Material **mat; + struct MSelect *mselect; /* BMESH ONLY */ /*new face structures*/ @@ -91,7 +92,6 @@ typedef struct Mesh { struct MCol *mcol; struct MSticky *msticky; struct Mesh *texcomesh; - struct MSelect *mselect; struct BMEditMesh *edit_btmesh; /* not saved in file! */ |