diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-23 12:56:28 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-02-23 12:56:28 +0300 |
| commit | b46b2834b9596b9a7c026dd2e041a329cda9bb59 (patch) | |
| tree | 2b1c36f3ab62159a511b67dacc422542d0f91b87 /source/blender/makesdna | |
| parent | 53a9dec2bfecc8a2c863d850bcec05aafb008bac (diff) | |
| parent | 9dd194716b0f43fa02ae6cd32ada556d8d622390 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index fd601e55550..47677e50451 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -668,7 +668,8 @@ typedef struct NodeScriptDict { /* qdn: glare node */ typedef struct NodeGlare { char quality, type, iter; - char angle, pad_c1, size, pad[2]; + /* XXX angle is only kept for backward/forward compatibility, was used for two different things, see T50736. */ + char angle DNA_DEPRECATED, pad_c1, size, star_45, streaks; float colmod, mix, threshold, fade; float angle_ofs, pad_f1; } NodeGlare; |