Merge remote-tracking branch 'origin/blender2.8' into render-layers
authorDalai Felinto <dfelinto@gmail.com>
Thu, 26 Jan 2017 18:17:22 +0000 (19:17 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 26 Jan 2017 18:17:22 +0000 (19:17 +0100)
commitc1742b88a4cf58e474b3dfe9d01921105b8c8b6e
tree1147fc9d41c9200f9f591d6dd26720af4f1225b3
parent8f673cb40c6d038ecaabd24c6549dc5c7571c26a
parent8d04f49d0ea53552500e82afea92addaaa939dfd
Merge remote-tracking branch 'origin/blender2.8' into render-layers

Note:

renamed blo_do_versions_after_linking_280 to do_versions_after_linking_280 to following the pattern of do_versions_after_linking_270
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/versioning_280.c
tests/python/CMakeLists.txt