Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Mon, 2 Jan 2017 10:31:03 +0000 (11:31 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Mon, 2 Jan 2017 10:31:03 +0000 (11:31 +0100)
commitd78f51a4c239d9e4ab659c3386b6262ff8a4b8df
tree53b4c3c1b7393c3270d5deb2eff94dac653f44d6
parentfb20cbe04cf4277c40d2a395d0d4cc3aee3707ed
parent13174df534e76c528e9d4f959eebbc6481ebf9f1
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/blenkernel/intern/library.c