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)
commit69655a1103bccdee7e39c7f0a6772c8178947992
tree9f76af90e431eb08c1ad753082ff2e45976a6381
parenta0ae6d7116c289335a870b5ff5360f896af327ba
parent49a3eaa3dc416d7f8c96c4c01da95c52a587821b
Merge remote-tracking branch 'origin/master' into blender2.8
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