Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Jun 2017 15:45:36 +0000 (17:45 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Jun 2017 15:45:36 +0000 (17:45 +0200)
commitbe4cf933abfef8c5e8ee02e04a236e414bc11287
treefc0cd6e768bef785778f52e88440d5782f34e144
parent6ea6c516708abb1f82de7716de7f2a63646e82ee
parentf02e04f1338a84ed1a02734854c83244b9fd0002
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c