diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-01 01:35:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-01 01:35:49 +0400 |
| commit | 35708fe15044445fead8bc7c3709edea6921cff5 (patch) | |
| tree | 835087aae42cd973e4a51895e60e206434c0e0fe /source/blender/makesdna/DNA_mesh_types.h | |
| parent | a20ca0ca32087b97c76819be88091b7caf4da85c (diff) | |
| parent | af0a469307d5abe30d59c62c61d8bbc361bdf359 (diff) | |
Merged changes in the trunk up to revision 44561.
Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index a5adc8c200a..bb1f17010bb 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -39,25 +39,24 @@ #include "DNA_defs.h" /* USE_BMESH_FORWARD_COMPAT */ +struct AnimData; struct DerivedMesh; struct Ipo; struct Key; -struct Material; -struct MVert; +struct MCol; struct MEdge; struct MFace; -struct MCol; -struct MSticky; -struct Mesh; -struct OcInfo; -struct MPoly; -struct MTexPoly; struct MLoop; -struct MLoopUV; struct MLoopCol; +struct MLoopUV; +struct MPoly; +struct MSticky; +struct MTexPoly; +struct MVert; +struct Material; +struct Mesh; struct Multires; -struct EditMesh; -struct AnimData; +struct OcInfo; typedef struct Mesh { ID id; |