Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 22 Aug 2017 14:31:33 +0000 (16:31 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 22 Aug 2017 14:31:33 +0000 (16:31 +0200)
commit9cfb72ff81a36c26f4b611ec733432968f15a2de
treebf7c6af1e2f11bffa681148dd6dff7ca04299b8d
parent831e86d5391e8665d2fd05c7ff58cf08b8d41a54
parent9f40153094bc72c0c4372893f20f9d2aace17049
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/image.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/depsgraph_type_defines.cc
source/blender/depsgraph/intern/depsgraph_types.h
source/blender/makesrna/intern/rna_image_api.c