Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 17 Oct 2018 14:50:09 +0000 (16:50 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 17 Oct 2018 14:50:36 +0000 (16:50 +0200)
commitd31ea3b89aa8d583a6d089f96dff46c0759f8c8a
tree9d24890a0d783b907b8064ec3643a001d0a91048
parent938aa52313bba9bd001ea3e9a697658d12e3308e
parent5f8222501c2267ae82829ccf6f6df295a8b8ec55
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/BKE_global.h
source/blender/editors/undo/ed_undo.c
source/blender/blenkernel/BKE_global.h
source/blender/editors/undo/ed_undo.c
source/blender/python/intern/bpy_app.c