Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 6 Dec 2017 13:06:49 +0000 (14:06 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 6 Dec 2017 13:06:49 +0000 (14:06 +0100)
commit46f518e92790a04885f4e047bb59b11019d73aa3
treed893b5be0dd0fc2b361152b84a07d6e33ab74a2b
parent6c49b4154b16aa7a3b867c561cc233ce5cdb9cb4
parent13e9291650f2f8c8c71fa13d5cc2c4fb7938cd05
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c