[Bf-blender-cvs] [c5619236173] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Nick Wu]

Commit: c56192361734cff3628e469de67bccdb2190b609
Author: Nick Wu
Date:   Mon Jun 18 10:22:20 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBc56192361734cff3628e469de67bccdb2190b609

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Conflicts:
	source/tools

===================================================================



===================================================================