Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 17:53:34 +0000 (19:53 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 May 2018 17:53:34 +0000 (19:53 +0200)
commit599bf05c5683e0314e4dfdf03b21246fe99f7056
tree0c95c7aa81fb4568ed4a4cf73aac3fdcb7eb3937
parentbf0d16e30ebd692d2e9ce8b5251ffa467e3fed7d
parent4461be1b722a4f6e5af4854eb12023b3670a4c3d
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/undo_system.c
source/blender/windowmanager/intern/wm_files.c