[Bf-blender-cvs] [78277fe3f85] soc-2018-npr: Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

[Nick Wu]

Commit: 78277fe3f8526b83a945f25f2f9e4396ad188d16
Author: Nick Wu
Date:   Tue Jul 17 15:33:54 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB78277fe3f8526b83a945f25f2f9e4396ad188d16

Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

# Conflicts:
#	intern/opensubdiv/opensubdiv_capi.h
#	intern/opensubdiv/opensubdiv_evaluator_capi.cc
#	source/blender/modifiers/intern/MOD_mybmesh.c

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



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