diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-05 15:40:42 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-05 15:40:42 +0400 |
| commit | bb1f8d9586220446c4df6339554b6cb0af02f030 (patch) | |
| tree | 8b0778b7f5e8eb18b7ce817e150efc949adcab22 /source/blender/render/intern/include/render_types.h | |
| parent | 19e27ce15b213bc7c888e4a57ad97faa5dbb4220 (diff) | |
| parent | f1e3c31d4ffa86b695fddd45d9ccc6ce9ac62ea7 (diff) | |
Merged changes in the trunk up to revision 46309.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index fc64f0a6e1b..406c8e08f0d 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -528,13 +528,13 @@ typedef struct LampRen { float shdwr, shdwg, shdwb; float energy, haint; int lay; - float spotsi,spotbl; + float spotsi, spotbl; float vec[3]; float xsp, ysp, distkw, inpr; float halokw, halo; short falloff_type; - float ld1,ld2; + float ld1, ld2; struct CurveMapping *curfalloff; /* copied from Lamp, to decouple more rendering stuff */ |