Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 14:22:28 +0000 (16:22 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 14:22:34 +0000 (16:22 +0200)
commiteb3ae79c2d473e8621224e0bb21c2e8fad6c7943
tree53797c7ba44b1b37d189bbdcdf7bcfe6352458bd
parentcf95267456a0c4f988691ecc822c211ff7849c55
parent141f0f4c4717a8f6090515779de10e205455644b
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_context.h