Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 17 Jan 2018 08:29:50 +0000 (19:29 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 17 Jan 2018 08:29:50 +0000 (19:29 +1100)
commitdfea9f43dbc445cb08a72890d6b1c2e29f2ae224
tree2522031029103df9a10fce9d1adf2d1bffb3d47f
parent8d064c5bc4cd0fb5577c58ba6f15d0040774354a
parent7935a394b7a8ab924a6431f6fb839913ea0129f6
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_image/space_image.c