Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 14 Jun 2017 09:17:13 +0000 (11:17 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 14 Jun 2017 09:17:13 +0000 (11:17 +0200)
commit6656af2d11cd70739b9423275729d7acb240e554
tree694fc7035e800f05e24a6fed28dc8c293dc247ea
parent48cd25a11aeca7e9d899130171a9d9848e89cf26
parent20e5052a72215fa432f7b74cd4b77a5fd8c8e7f1
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/node.c
source/blender/windowmanager/intern/wm.c