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)
1  2 
release/scripts/modules/bpy_types.py
source/blender/makesrna/intern/rna_wm.c
source/blender/makesrna/intern/rna_wm_api.c

Simple merge