Merge remote-tracking branch 'origin/master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Fri, 6 Jul 2018 11:53:35 +0000 (13:53 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Fri, 6 Jul 2018 11:53:35 +0000 (13:53 +0200)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_ocean.c