Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 May 2018 12:22:46 +0000 (14:22 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 May 2018 12:22:46 +0000 (14:22 +0200)
commitb857b8f4c441ba40c7848f176ba750c4a4b093cb
treed30bae4794e659fccd1b2bd64e6b2cea2ded3048
parentcc8672b95ec61c3292dc0f07620808a4b9b0a373
parent49fe27ee46b4d9272957c21c13365db322ca8396
Merge branch 'master' into blender2.8
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/modifiers/intern/MOD_subsurf.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_warp.c