Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 18 Jan 2018 03:11:38 +0000 (14:11 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 18 Jan 2018 03:11:38 +0000 (14:11 +1100)
commite8452cf0bccea0b06a24b370e9ed2331abec3a3c
tree096305a009bb44c0c68fe07e9cb98f28fe60c4b9
parent27dff3fbc1e74aa6613d68a0d9f9b0096fc86f6e
parent6880a549ba4bb4150c17df196a1d6d24e66d8486
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/makesdna/DNA_scene_types.h