diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
commit | 53a56b7b6c169b21df475ae94795208501581489 (patch) | |
tree | 011410b7ff5488b5b9d57029ed576929e770bceb /source/blender/modifiers/intern/MOD_armature.c | |
parent | d89f9d70c52001e09ee3ab80a3547ba140e00aec (diff) | |
parent | 3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_armature.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index dc255ff2f12..fc077a4ca61 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -64,10 +64,10 @@ static void initData(ModifierData *md) amd->deformflag = ARM_DEF_VGROUP; } -static void copyData(ModifierData *md, ModifierData *target) +static void copyData(const ModifierData *md, ModifierData *target) { #if 0 - ArmatureModifierData *amd = (ArmatureModifierData *) md; + const ArmatureModifierData *amd = (const ArmatureModifierData *) md; #endif ArmatureModifierData *tamd = (ArmatureModifierData *) target; |