diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-07-27 22:42:50 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-07-27 22:42:50 +0300 |
| commit | e704c78d8799172aa0f5a9122c0ff72642db0203 (patch) | |
| tree | 5610b07c0c489663c24809c88da967ba261c90c4 /source/blender/blenloader/intern/readfile.c | |
| parent | 3c643440a3348e1fc8ddc79fcdbd3933e1245562 (diff) | |
| parent | 48759580839aa4e2ad2541ff4c19baaaf751721d (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into udimtemp-udim-images
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5ddba2aa282..91abcdf7a89 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5561,7 +5561,6 @@ static void direct_link_object(FileData *fd, Object *ob) ob->derivedDeform = NULL; ob->derivedFinal = NULL; BKE_object_runtime_reset(ob); - BLI_listbase_clear(&ob->gpulamp); link_list(fd, &ob->pc_ids); /* Runtime curve data */ |