Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 4 May 2018 05:30:14 +0000 (07:30 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 4 May 2018 05:30:14 +0000 (07:30 +0200)
commitb3545ae37352ec440ee8fece0cd9c66289ebe52f
treea12039bd4f48b9adafe144a730e14b7405e0ed7f
parent892dd3d069508319a8eff8a1401977e27d01f648
parentf3c5b0394f095bb017c19c5a945c8e7714205bf2
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_idprop.h
source/blender/blenkernel/intern/idprop.c
source/blender/windowmanager/intern/wm_keymap.c