Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 22 Apr 2018 08:51:23 +0000 (10:51 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 22 Apr 2018 08:51:23 +0000 (10:51 +0200)
commit1de7a0c0dc011a9286f14552858f10efc64d5f91
tree1957a7ddac128dd6c1fa88aa900ccbd5752800c8
parente597f7495abcb5eedf8db27b4c4a72b3a58b727e
parent420e379e99a3351b2dd2a46989aa1d50bdf8abef
Merge branch 'master' into blender2.8
release/scripts/modules/bpy_types.py
source/blender/makesrna/intern/rna_wm.c
source/blender/makesrna/intern/rna_wm_api.c