Commit: a51a6839937b1d155d5ab692cb763681381a4c3f
Author: Nick Wu
Date: Mon May 28 21:55:49 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBa51a6839937b1d155d5ab692cb763681381a4c3f
Merge remote-tracking branch 'remotes/origin/soc-2018-npr' into soc-2018-npr
Conflicts:
intern/cycles/blender/blender_python.cpp
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
