Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2018 07:39:35 +0000 (09:39 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2018 07:39:35 +0000 (09:39 +0200)
commita9f92366709782a1bfdabdd0ec26383be60a6341
tree5761f1b4d41c712e8e9771aeb1138035324298d2
parentab375079df06de112fc7697ebfe626903b7da97e
parentbfbd85e9d66be3793e51ef989f793bdd69214493
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/blender_undo.c