Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 15 Feb 2018 17:15:00 +0000 (18:15 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 15 Feb 2018 17:15:00 +0000 (18:15 +0100)
1  2 
source/blender/blenkernel/intern/particle_child.c
source/blender/windowmanager/intern/wm_event_system.c