Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 14 Jun 2017 08:48:20 +0000 (10:48 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 14 Jun 2017 08:48:20 +0000 (10:48 +0200)
commitedad3076a91c72fb0bcaef651b9688d36999eec3
treed89911793f1a88a1a433dcdb1f63306cc1fd29d0
parent07c7bbef0dfa94fc8217d54f583ccdc7ea1657ab
parent1e6ad49dca6145c61c94a3e196526edd9b6459d4
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library_remap.c