Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Sun, 29 Oct 2017 16:31:55 +0000 (17:31 +0100)
committerSybren A. Stüvel <sybren@stuvel.eu>
Sun, 29 Oct 2017 16:31:55 +0000 (17:31 +0100)
commit34859b285aff14b022c9b175fa2babfff7c63314
treea07bfadfa50a516af32ee9ef6fdc0c68302c55fb
parent405980b1facff4a76e3661a412eab1d072d0236f
parent6099b2620d645f4129c42af2272cb6bd8538fc7a
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/cachefile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/intern/rna_cachefile.c
source/blender/modifiers/intern/MOD_meshsequencecache.c