Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00
parent 3325487530 b372766816
commit 18d87e79e9
140 changed files with 1 additions and 147 deletions
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -1508,4 +1508,3 @@ static int cloth_build_springs ( ClothModifierData *clmd, Mesh *mesh )
 /***************************************************************************************
 * SPRING NETWORK GWN_BATCH_BUILDING IMPLEMENTATION END
 ***************************************************************************************/
-