diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 05:40:04 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 05:40:04 +0400 |
| commit | 69289c978eace478bf992517473960d540895815 (patch) | |
| tree | 493d2c9bec32f761468b082fbbb015c748b71685 /source/blender/makesrna/RNA_access.h | |
| parent | 5f093d6a5867a365900158fcca71296852787aac (diff) | |
| parent | be674afdadaa1ab966147755e224e8bbda6807db (diff) | |
Merged changes in the trunk up to revision 44266 (including BMesh).
Freestyle edge/face marks were ported to BMesh.
Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c
Diffstat (limited to 'source/blender/makesrna/RNA_access.h')
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 9127724eeb4..2232655afae 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -343,9 +343,12 @@ extern StructRNA RNA_Menu; extern StructRNA RNA_Mesh; extern StructRNA RNA_MeshColor; extern StructRNA RNA_MeshColorLayer; +extern StructRNA RNA_MeshLoopColorLayer; extern StructRNA RNA_MeshDeformModifier; extern StructRNA RNA_MeshEdge; extern StructRNA RNA_MeshFace; +extern StructRNA RNA_MeshPolygon; +extern StructRNA RNA_MeshLoop; extern StructRNA RNA_MeshFloatProperty; extern StructRNA RNA_MeshFloatPropertyLayer; extern StructRNA RNA_MeshIntProperty; @@ -355,6 +358,8 @@ extern StructRNA RNA_MeshStringProperty; extern StructRNA RNA_MeshStringPropertyLayer; extern StructRNA RNA_MeshTextureFace; extern StructRNA RNA_MeshTextureFaceLayer; +extern StructRNA RNA_MeshTexturePoly; +extern StructRNA RNA_MeshTexturePolyLayer; extern StructRNA RNA_MeshVertex; extern StructRNA RNA_MessageSensor; extern StructRNA RNA_MetaBall; |