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

[Nick Wu]

Commit: 002712d04c356924b17e0cc71d28a552ea2f8a97
Author: Nick Wu
Date:   Mon Jul 30 23:20:28 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB002712d04c356924b17e0cc71d28a552ea2f8a97

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

# Conflicts:
#	release/scripts/startup/bl_ui/properties_scene.py

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



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