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)
commit4438325ec91dac9ab0c30b910c9bd6a4fb1471c1
tree48cfd1eef78d465a6cbeb05024d37d618c265c42
parentca5fdd857b7864b0336aca655f2c04d00090c0f9
parente03f335b1d81c3820e206849cb72860f7d2d2c39
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/particle_child.c
source/blender/windowmanager/intern/wm_event_system.c