Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 9 Nov 2016 13:36:59 +0000 (14:36 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 9 Nov 2016 13:36:59 +0000 (14:36 +0100)
1  2 
intern/cycles/blender/blender_sync.cpp
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/rigidbody.c