[Bf-blender-cvs] [cef85036e92] soc-2018-npr: Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

[Nick Wu]

Commit: cef85036e92bbb3cc7a910bdd73f1c61fd1fa699
Author: Nick Wu
Date:   Tue Jul 10 21:52:28 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBcef85036e92bbb3cc7a910bdd73f1c61fd1fa699

Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

Conflicts:
	intern/opensubdiv/opensubdiv_converter.cc

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



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