Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Apr 2018 07:54:50 +0000 (09:54 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Apr 2018 07:54:50 +0000 (09:54 +0200)
commiteaf8608ba5e949f0bc81a57bc54822d4283a312a
treed9919e7ece856389778a8d14532688615f760235
parentcd6daea7d32d306a427e97427cb135d1589cc309
parent4674e02562637f36a9900bff5f5f4acc9aff482d
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/intern/armature_update.c
source/blender/blenloader/intern/readfile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/makesdna/DNA_action_types.h