diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2014-10-23 17:12:28 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2014-10-23 17:12:28 +0400 |
| commit | 9ff1ebed52e0f858a395eeea4caf89304e068b2d (patch) | |
| tree | b05d0f4b229de61b088a128ad412dd7bba347928 /source/blender/blenkernel/intern/lamp.c | |
| parent | a2ed11c6eeab5fab8cb81e32e1c68fdafdd5dbbc (diff) | |
| parent | eaaeae469968c5c78a5d7e6d202f1af00b382a79 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2014-fluid
Conflicts:
.gitignore
intern/cycles/CMakeLists.txt
source/blender/blenkernel/intern/smoke.c
source/blender/python/intern/bpy_interface.c
source/creator/CMakeLists.txt
Diffstat (limited to 'source/blender/blenkernel/intern/lamp.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lamp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 749e915e5ca..4a413850ec0 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -135,8 +135,7 @@ Lamp *localize_lamp(Lamp *la) Lamp *lan; int a; - lan = BKE_libblock_copy(&la->id); - BLI_remlink(&G.main->lamp, lan); + lan = BKE_libblock_copy_nolib(&la->id, false); for (a = 0; a < MAX_MTEX; a++) { if (lan->mtex[a]) { |