diff options
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 93891a9edfa..ed9eaff4b92 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -114,7 +114,7 @@ typedef struct bNodeSocket { /* sock->struct_type */ #define SOCK_STRUCT_NONE 0 /* default, type is defined by sock->type only */ -#define SOCK_STRUCT_OUTPUT_MULTI_FILE 1 /* multi file output node socket */ +#define SOCK_STRUCT_OUTPUT_FILE 1 /* file output node socket */ /* socket side (input/output) */ #define SOCK_IN 1 @@ -352,7 +352,7 @@ typedef struct NodeHueSat { float hue, sat, val; } NodeHueSat; -typedef struct NodeImageFile { +typedef DNA_DEPRECATED struct NodeImageFile { char name[1024]; /* 1024 = FILE_MAX */ struct ImageFormatData im_format; int sfra, efra; @@ -362,10 +362,11 @@ typedef struct NodeImageMultiFile { char base_path[1024]; /* 1024 = FILE_MAX */ int active_input; /* selected input in details view list */ int pad; + ImageFormatData format; } NodeImageMultiFile; typedef struct NodeImageMultiFileSocket { - short use_render_format; /* use global render settings instead of own format */ - short pad1; + short use_render_format DNA_DEPRECATED; + short use_node_format; /* use overall node image format */ int pad2; ImageFormatData format; } NodeImageMultiFileSocket; |