diff options
| author | Raja Kedia(miyagix) <rajakedia2222@gmail.com> | 2017-12-14 21:47:35 +0300 |
|---|---|---|
| committer | Raja Kedia(miyagix) <rajakedia2222@gmail.com> | 2017-12-14 21:47:35 +0300 |
| commit | 450eb4ef6c54108e16164aa0820ee00fea9b8b48 (patch) | |
| tree | 643a8c2b026205961d2539ac7a5bf363e5f5f500 /source/blender/blenkernel/intern/lamp.c | |
| parent | 31d5262cece4c5644a36cf0511bc42007a2c1e6d (diff) | |
| parent | ba256b32ee5d3ab7991fe5abbb47071ccfe8577c (diff) | |
Merge remote-tracking branch 'origin' into soc-2017-sculpting_brushsoc-2017-sculpting_brush
Diffstat (limited to 'source/blender/blenkernel/intern/lamp.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lamp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 69a2067f4e6..2242ba379fb 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -116,7 +116,7 @@ Lamp *BKE_lamp_add(Main *bmain, const char *name) return la; } -Lamp *BKE_lamp_copy(Main *bmain, Lamp *la) +Lamp *BKE_lamp_copy(Main *bmain, const Lamp *la) { Lamp *lan; int a; |