[Bf-blender-cvs] [12b3733] soc-2016-multiview: solve conflict between local and upstream

[Tianwei Shen]

Commit: 12b3733462c1e97eca752e8ba3e5c9d8c4e6a2bc
Author: Tianwei Shen
Date:   Thu May 26 00:24:44 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB12b3733462c1e97eca752e8ba3e5c9d8c4e6a2bc

solve conflict between local and upstream

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



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