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

[Nick Wu]

Commit: 508a06e581c819dede2d13c7ad5ca80d57a6c704
Author: Nick Wu
Date:   Wed Jul 4 17:38:13 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB508a06e581c819dede2d13c7ad5ca80d57a6c704

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

Conflicts:
	source/blender/draw/engines/lanpr/lanpr_engine.c

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



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