Merge branch 'master' into blender2.8

2018-06-17 17:10:19 +02:00
parent 61d27db359 a24b4e6090
commit 06a1a66a9b
565 changed files with 8449 additions and 8449 deletions
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -60,7 +60,7 @@
 static void initData(ModifierData *md)
 {
 	ArmatureModifierData *amd = (ArmatureModifierData *) md;
-	
+
 	amd->deformflag = ARM_DEF_VGROUP;
 }

@@ -120,7 +120,7 @@ static void deformVerts(
 	ArmatureModifierData *amd = (ArmatureModifierData *) md;

 	modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
-	
+
 	armature_deform_verts(amd->object, ctx->object, mesh, vertexCos, NULL,
 	                      numVerts, amd->deformflag, (float(*)[3])amd->prevCos, amd->defgrp_name);