Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 15 Nov 2017 09:46:19 +0000 (10:46 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 15 Nov 2017 09:46:19 +0000 (10:46 +0100)
commit2a7f8d3cb332055f026cd09933136d6981b585e7
treeae93233578e32570c1f5d47f83dd0b81a9bfefb9
parent44517c5f2177d1f260ba691fb59fbacfef576915
parent556b13f03e561b54d4f0186e207f080c786f8b66
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/blenlib/intern/rand.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/makesrna/intern/rna_mask.c
source/blender/alembic/intern/abc_mball.h
source/blender/blenkernel/intern/outliner_treehash.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/object/object_ops.c
source/blender/makesrna/intern/rna_cachefile.c
source/blender/makesrna/intern/rna_mask.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_smoke.c