Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 May 2018 16:04:16 +0000 (18:04 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 May 2018 16:04:16 +0000 (18:04 +0200)
commit56f7b4616a4af9ee8ea3bf78bb2913afdb6bcb54
treeb277155510f31b3f5a4ddfc948d13d5f45aea519
parentb49184b608df297195c5f0e81da4d8d9ddfb9213
parentc09e22306add3e0e1fdff6171eb21e4fde18019e
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/modifier.c