diff options
author | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
commit | 889c4ca9c26d770af02cedef972d65eb173bdb5e (patch) | |
tree | 6f46156146db1b3f09d92c6eaa1f44ba8a584ed4 /source/blender/makesdna/DNA_shader_fx_types.h | |
parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--archived
Diffstat (limited to 'source/blender/makesdna/DNA_shader_fx_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_shader_fx_types.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h index 18a4e8655a3..f19181bf07d 100644 --- a/source/blender/makesdna/DNA_shader_fx_types.h +++ b/source/blender/makesdna/DNA_shader_fx_types.h @@ -50,7 +50,7 @@ typedef enum ShaderFxMode { eShaderFxMode_Realtime = (1 << 0), eShaderFxMode_Render = (1 << 1), eShaderFxMode_Editmode = (1 << 2), - eShaderFxMode_Expanded = (1 << 3), + eShaderFxMode_Expanded_DEPRECATED = (1 << 3), } ShaderFxMode; typedef enum { @@ -64,7 +64,8 @@ typedef struct ShaderFxData { int type, mode; int stackindex; short flag; - char _pad[2]; + /* Expansion for shader effect panels and sub-panels. */ + short ui_expand_flag; /** MAX_NAME. */ char name[64]; @@ -171,6 +172,10 @@ typedef struct PixelShaderFxData { ShaderFxData_Runtime runtime; } PixelShaderFxData; +typedef enum ePixelShaderFx_Flag { + FX_PIXEL_FILTER_NEAREST = (1 << 0), +} ePixelShaderFx_Flag; + typedef struct RimShaderFxData { ShaderFxData shaderfx; int offset[2]; |