diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-08 11:39:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-08 11:39:32 +0300 |
| commit | c26da06ae67348f62b27af33b76f2d18e6c7c274 (patch) | |
| tree | 599d76f3b8ce2dc08b20e5617d11854314d12da2 /source/blender/blenloader | |
| parent | 84d4476eb11cddcc88c8271c22bb8d1051421f0d (diff) | |
| parent | 96e507d9890e42695ea0c6bff0c8fa5c480bbb5a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index dcd993838e6..8c5e947d004 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4119,10 +4119,6 @@ static void lib_link_material(FileData *fd, Main *main) IDP_LibLinkProperty(ma->id.properties, fd); lib_link_animdata(fd, &ma->id, ma->adt); - /* Link ID Properties -- and copy this comment EXACTLY for easy finding - * of library blocks that implement this.*/ - IDP_LibLinkProperty(ma->id.properties, fd); - ma->ipo = newlibadr_us(fd, ma->id.lib, ma->ipo); // XXX deprecated - old animation system ma->group = newlibadr_us(fd, ma->id.lib, ma->group); |