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

[Nick Wu]

Commit: 61d3c1261c5d9e40c41ae540b83952e411670fe8
Author: Nick Wu
Date:   Sun Dec 23 19:09:42 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB61d3c1261c5d9e40c41ae540b83952e411670fe8

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

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



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