diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/makesdna/DNA_lamp_types.h | |
parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_lamp_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_lamp_types.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index 3a4b07cc791..e1ab56a0206 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -47,14 +47,14 @@ struct MTex; typedef struct Lamp { ID id; - struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ - + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ + short type, flag; int mode; float r, g, b, k; float shdwr, shdwg, shdwb, shdwpad; - + float energy, dist, spotsize, spotblend; float att1, att2; /* Quad1 and Quad2 attenuation */ @@ -62,18 +62,18 @@ typedef struct Lamp { struct CurveMapping *curfalloff; short falloff_type; short pad2; - + float clipsta, clipend; float bias, soft, bleedbias, bleedexp; short bufsize, samp, buffers, filtertype; char bufflag, buftype; - + short area_shape; float area_size, area_sizey, area_sizez; - + /* texact is for buttons */ short texact, shadhalostep; - + struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ short pr_texture, use_nodes; char pad6[4]; @@ -99,7 +99,7 @@ typedef struct Lamp { /* flag */ #define LA_DS_EXPAND 1 - /* NOTE: this must have the same value as MA_DS_SHOW_TEXS, + /* NOTE: this must have the same value as MA_DS_SHOW_TEXS, * otherwise anim-editors will not read correctly */ #define LA_DS_SHOW_TEXS 4 |