Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 22 Nov 2018 04:16:45 +0000 (15:16 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 22 Nov 2018 04:16:45 +0000 (15:16 +1100)
commit4b9d242be53203dfa6dc8cd86aef79cce24bc00a
treed772c35aedf986633f16c6bdc5312278f58cb36d
parent1844ccd5210bf0c57c97b550fd38c2dc141cfb62
parentc66570f519fb24e0c3fb724d7b6d38f4b6fd7ffc
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_blendfile.h
source/blender/blenkernel/intern/blender_undo.c
source/blender/blenkernel/intern/blendfile.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readblenentry.c
source/blender/blenloader/intern/undofile.c
source/blender/editors/render/render_preview.c
source/blender/windowmanager/intern/wm_files.c