Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 16:04:41 +0000 (18:04 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 16:04:41 +0000 (18:04 +0200)
1  2 
source/blender/editors/undo/ed_undo.c

Simple merge