Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 04:34:25 +0000 (14:34 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 04:34:31 +0000 (14:34 +1000)
1  2 
source/blender/blenkernel/intern/appdir.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/space_file/fsmenu.c
source/blender/imbuf/intern/thumbs.c
source/blender/modifiers/intern/MOD_fluidsim_util.c

Simple merge