[Bf-blender-cvs] [be0628b7434] soc-2018-npr: Merge branch 'master' into soc-2018-npr

[Yiming Wu]

Commit: be0628b743462b7606109dccec2e1d93e51dba0d
Author: Yiming Wu
Date:   Fri Dec 28 10:59:36 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBbe0628b743462b7606109dccec2e1d93e51dba0d

Merge branch 'master' into soc-2018-npr

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



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