Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 21 Feb 2018 23:59:32 +0000 (00:59 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 21 Feb 2018 23:59:32 +0000 (00:59 +0100)
commit257cf86a05517fd66d65f55c95fc28ec945804a8
treec5285a39e47d56ef926a91be803685521ef6f2be
parent04964ff1f4ef9ad23fa3e6cb0444bf28dd6813b5
parent5d5c6bb5efee9bd03004845f9b1eee9d43883525
Merge branch 'master' into blender2.8
source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
source/blender/depsgraph/intern/depsgraph.cc
source/blender/editors/animation/anim_filter.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_nla/space_nla.c
source/blender/editors/transform/transform_conversions.c
source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c