Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 9 Jun 2018 13:18:21 +0000 (15:18 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 9 Jun 2018 13:18:21 +0000 (15:18 +0200)
commit70f8eaf1b769c402ec61d86f25237d6b64186861
tree035d1da0dc7ca1ff1cfefad013181dc0ce3084ed
parent2ca8230f67db3d6c4693d0a2e0997dfd5de43091
parent638de722775fc43c3543a30aaa888372fe93fe98
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_view3d/drawobject.c
12 files changed:
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/intern/modifier.c
source/blender/editors/include/ED_node.h
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/node_templates.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_ID.h
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_meshcache.c
source/blender/modifiers/intern/MOD_ocean.c