git.blender.org - blender.git/commit

author	Sergey Sharybin <sergey.vfx@gmail.com>
	Thu, 26 Jan 2017 16:02:28 +0000 (17:02 +0100)
committer	Sergey Sharybin <sergey.vfx@gmail.com>
	Thu, 26 Jan 2017 16:02:28 +0000 (17:02 +0100)
commit	9e48cafd6d6a3512a41e98e71d957923fbf3cb1d
tree	1431c8a1fd6e834059d4aa1f063620a036feba46	tree
parent	290e080db40e746416d2f70d28cb906ceb4c4723	commit \| diff
parent	fd69ba225540cde5e4c1fa651fb02df21ea0a143	commit \| diff

Merge branch 'master' into blender2.8

The official Blender Foundation tree

source/blender/blenkernel/intern/scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/versioning_270.c	diff1 \|	diff2 \|	blob \| history
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_node/drawnode.c	diff1 \|	diff2 \|	blob \| history