diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-23 02:40:19 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-23 02:40:19 +0300 |
| commit | 1dfb89d229304c302b8849756aa0ddd7e8d96488 (patch) | |
| tree | db7a2ed403101788b2cb308538d73a99c95621d6 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 4a1feaa5558ed60388fd3be41db74fbc54f2ab08 (diff) | |
| parent | 1b2b7cfa2007172e07d78324bb941d0160b59c42 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/ghost/intern/GHOST_ContextCGL.mm
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/makesrna/intern/rna_main.c
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index d338d279b72..759ebbfb5cb 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -240,9 +240,9 @@ typedef struct ThemeSpace { char wire[4], wire_edit[4], select[4]; char lamp[4], speaker[4], empty[4], camera[4]; char active[4], group[4], group_active[4], transform[4]; - char vertex[4], vertex_select[4], vertex_unreferenced[4]; + char vertex[4], vertex_select[4], vertex_bevel[4], vertex_unreferenced[4]; char edge[4], edge_select[4]; - char edge_seam[4], edge_sharp[4], edge_facesel[4], edge_crease[4]; + char edge_seam[4], edge_sharp[4], edge_facesel[4], edge_crease[4], edge_bevel[4]; char face[4], face_select[4]; /* solid faces */ char face_dot[4]; /* selected color */ char extra_edge_len[4], extra_edge_angle[4], extra_face_angle[4], extra_face_area[4]; |