diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-04-25 11:11:55 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-04-25 11:11:55 +0300 |
| commit | d3b5ab37772aafd6892466a61eb75741f70189de (patch) | |
| tree | fd5a4c1b0a76313ddee5b2a1fa93a7b6f618cd85 /source/blender/makesdna/DNA_space_types.h | |
| parent | 99dfc769f32a53c118692451d38d534bed697e88 (diff) | |
| parent | 416ef3b6b2d21a2eb7a24183ab67c8a540f79d57 (diff) | |
Merge branch 'master' into temp-gp-overlay-refactortemp-gp-overlay-refactor
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 8d527caa361..bce124a26cf 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -1968,8 +1968,7 @@ typedef struct SpreadsheetRowFilter { float value_float2[2]; float value_float3[3]; float value_color[4]; - - char _pad1[4]; + uint8_t value_byte_color[4]; } SpreadsheetRowFilter; typedef enum eSpaceSpreadsheet_RowFilterFlag { @@ -2006,6 +2005,7 @@ typedef enum eSpreadsheetColumnValueType { SPREADSHEET_VALUE_TYPE_COLOR = 5, SPREADSHEET_VALUE_TYPE_INSTANCES = 6, SPREADSHEET_VALUE_TYPE_STRING = 7, + SPREADSHEET_VALUE_TYPE_BYTE_COLOR = 8, } eSpreadsheetColumnValueType; /** |