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)
1  2 
source/blender/blenkernel/BKE_context.h