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)
commit1e35f4da7268b76b12a2a23452d0a632a8d790a7
treeb3ba68e17ade96f90986de14d1221026f564384d
parentaf7d0af153a35796b6eb7cde3fc417025919495d
parentc13b2a2504393371e32a4fb4c01cfad8d7cc929e
Merge branch 'master' into blender2.8
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