From 2d6cf9ee6b5864117a32fcbcaaadbee2bce8a930 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Nov 2010 01:50:25 +0000 Subject: [PATCH] the 'Multi' option was not being copied with the armature modifier. --- source/blender/blenkernel/intern/armature.c | 6 +++--- source/blender/modifiers/intern/MOD_armature.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index ea01421a0ea..11016ea620f 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -813,9 +813,9 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, bDeformGroup *dg; DualQuat *dualquats= NULL; float obinv[4][4], premat[4][4], postmat[4][4]; - int use_envelope = deformflag & ARM_DEF_ENVELOPE; - int use_quaternion = deformflag & ARM_DEF_QUATERNION; - int invert_vgroup= deformflag & ARM_DEF_INVERT_VGROUP; + const short use_envelope = deformflag & ARM_DEF_ENVELOPE; + const short use_quaternion = deformflag & ARM_DEF_QUATERNION; + const short invert_vgroup= deformflag & ARM_DEF_INVERT_VGROUP; int numGroups = 0; /* safety for vertexgroup index overflow */ int i, target_totvert = 0; /* safety for vertexgroup overflow */ int use_dverts = 0; diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 71be58c9982..56c3bd3acb5 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -61,6 +61,7 @@ static void copyData(ModifierData *md, ModifierData *target) tamd->object = amd->object; tamd->deformflag = amd->deformflag; + tamd->multi = amd->multi; strncpy(tamd->defgrp_name, amd->defgrp_name, 32); }