Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Jun 2017 14:55:57 +0000 (16:55 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Jun 2017 14:55:57 +0000 (16:55 +0200)
commit2270ca9023e4114fcbee305fa0f922c2d4e0087a
tree45f881196e17d2822c1cd1328b86fc60f9dcb182
parent109447d008b4719f24a807560c6cb9a63fc8f51f
parent85fafccb4c55cb0b119fbdb182f63083ad9d33e4
Merge branch 'master' into blender2.8
source/blender/depsgraph/intern/nodes/deg_node.cc
source/blender/depsgraph/intern/nodes/deg_node.h