diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-01-18 13:54:03 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-01-18 13:54:03 +0300 |
| commit | c64c51ee4db8a7441aea67a6ca7112062dd97dda (patch) | |
| tree | bda42cd74c74dd6a2dd9842ceebc4461de4c6543 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 4d939ff47ac54ff13825e2e0f27cba08e8ada60f (diff) | |
| parent | b3c18f037fefbd1c0a4bceb49b29adab3568f609 (diff) | |
Merge branch 'greasepencil-object' into greasepencil-refactor
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 753f3f524e5..aa0cd91538f 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -283,13 +283,12 @@ typedef struct ThemeSpace { unsigned char normal[4]; unsigned char vertex_normal[4]; unsigned char loop_normal[4]; - unsigned char bone_solid[4], bone_pose[4], bone_pose_active[4]; + unsigned char bone_solid[4], bone_pose[4], bone_pose_active[4], bone_locked_weight[4]; unsigned char strip[4], strip_select[4]; unsigned char cframe[4]; unsigned char time_keyframe[4], time_gp_keyframe[4]; unsigned char freestyle_edge_mark[4], freestyle_face_mark[4]; unsigned char time_scrub_background[4]; - char _pad5[4]; unsigned char nurb_uline[4], nurb_vline[4]; unsigned char act_spline[4], nurb_sel_uline[4], nurb_sel_vline[4], lastsel_point[4]; |