Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Feb 2018 02:10:39 +0000 (13:10 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Feb 2018 02:10:39 +0000 (13:10 +1100)
commit171c756f2006cf0e839fc9fcdd6b0cadebfe699a
tree39293150b38ff752b210e342e327902ff9dec2df
parentd7ba1ada8208f6f846b3705f5c6d9933261a625f
parentf36c803e55983ad30b032da2a775752eb4491fdc
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_modifier.h
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/windowmanager/intern/wm_event_system.c