Merge remote-tracking branch 'origin/blender2.8' into render-layers
authorDalai Felinto <dfelinto@gmail.com>
Fri, 23 Dec 2016 14:56:13 +0000 (15:56 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 23 Dec 2016 14:56:13 +0000 (15:56 +0100)
commitee6214dc804f05cbd0a45864bf283886dcf0efa3
treed0cb7abaeb98fe051e13f3bdbeea8448ac3aa7cc
parentc51a32554e02a9d27d5e6491e2589f4406f17ad1
parent605263177b8eea24c1449e4dbf0138175ec3dddf
Merge remote-tracking branch 'origin/blender2.8' into render-layers

Include manual changes to accomodate new do_versions_after_liblink
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/versioning_280.c