Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 14 Apr 2017 10:36:56 +0000 (12:36 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 14 Apr 2017 10:39:54 +0000 (12:39 +0200)
commit95b36321126fd6f9563b309930ac9ae6cf422a81
tree0722b78d4ffc69d49926d34d7ac0a9816c30dacd
parent6cda217a82078d7bdf61caec458154a507a58947
parent0b55b8cc6a37fa4e74c55c9ccb54950c5f546bd6
Merge branch 'master' into blender2.8

Conflicts:
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/alembic_capi.cc
source/blender/blenfont/intern/blf_glyph.c
source/blender/editors/object/object_modifier.c
source/blender/editors/render/render_shading.c
source/blender/editors/sound/sound_ops.c
source/blender/modifiers/intern/MOD_surfacedeform.c