diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-01-30 12:33:31 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-01-30 12:33:31 +0300 |
| commit | 938d0b5e2f51afa30b481195451b566a7765765f (patch) | |
| tree | 77e276c853b68931f49835ec6b0600f92deec3a7 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | e66cc7d8b77bb4a7ac00cd591135ce68441f1482 (diff) | |
| parent | 7a8e57f03df9f2887ae7b12cd80fc6e4bbd5ba27 (diff) | |
Merge branch 'greasepencil-object' into greasepencil-refactor
Conflicts:
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index aa0cd91538f..f99699e0bcc 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -413,6 +413,8 @@ typedef struct ThemeSpace { unsigned char info_warning[4], info_warning_text[4]; unsigned char info_info[4], info_info_text[4]; unsigned char info_debug[4], info_debug_text[4]; + unsigned char info_property[4], info_property_text[4]; + unsigned char info_operator[4], info_operator_text[4]; unsigned char paint_curve_pivot[4]; unsigned char paint_curve_handle[4]; |