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)
1  2 
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