Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jan 2017 16:02:28 +0000 (17:02 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jan 2017 16:02:28 +0000 (17:02 +0100)
commit9e48cafd6d6a3512a41e98e71d957923fbf3cb1d
tree1431c8a1fd6e834059d4aa1f063620a036feba46
parent290e080db40e746416d2f70d28cb906ceb4c4723
parentfd69ba225540cde5e4c1fa651fb02df21ea0a143
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/editors/space_node/drawnode.c