Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 09:21:52 +0000 (19:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 09:21:52 +0000 (19:21 +1000)
commit917d069cdb938306f0d1b5575066e9685abaedce
treed18103106a03e2730ae59d41c4b56cbea436afab
parent9d6d413c7c543463eea7874e7d5d4cf1e914325e
parentcf8d35edc89994e3d0399db720075ae1bafee8cc
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_wm.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_operators.c