Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 04:11:32 +0000 (15:11 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 04:11:32 +0000 (15:11 +1100)
commit8f8c23865922a77458f548752ffccb048b96ea5b
tree27766448763f940c6c736de51c4ac4f1942ce920
parentc312cc171b3e85306fb4c0d67f260bac14af2bfe
parent8c85f1316cdebc636f0210478a8a36b9475269fd
Merge branch 'master' into blender2.8
14 files changed:
source/blender/blenkernel/BKE_fcurve.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/animation/anim_filter.c
source/blender/editors/armature/armature_relations.c
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/space_outliner/outliner_tree.c