Commit: fbb5edf974f87894baa2cfd1a36878d5dce5be01 Author: Yiming Wu Date: Wed Apr 24 11:00:23 2019 +0800 Branches: soc-2018-npr https://developer.blender.org/rBfbb5edf974f87894baa2cfd1a36878d5dce5be01
Merge branch 'master' into soc-2018-npr # Conflicts: # source/blender/blenloader/intern/readfile.c =================================================================== =================================================================== _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
