diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
| commit | 5524ed9ba2d60331abed47c9df0bc2fcf330b36b (patch) | |
| tree | e8380010f140f022b77236af171d97083a294006 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 1360bb6fb0bf0c5c14235c47bf1399accbcecc6f (diff) | |
| parent | 689f3aa174ff795044a4dab719edf60b7b1f5bd3 (diff) | |
Merged changes in the trunk up to revision 55700.
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 1d7658d974e..a68d702594f 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -234,7 +234,7 @@ typedef struct ThemeSpace { char edge_seam[4], edge_sharp[4], edge_facesel[4], edge_crease[4]; char face[4], face_select[4]; /* solid faces */ char face_dot[4]; /* selected color */ - char extra_edge_len[4], extra_face_angle[4], extra_face_area[4], pad3[4]; + char extra_edge_len[4], extra_edge_angle[4], extra_face_angle[4], extra_face_area[4]; char normal[4]; char vertex_normal[4]; char bone_solid[4], bone_pose[4], bone_pose_active[4]; |