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)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_image/space_image.c