archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne
2018-05-08 15:20:18 +02:00
parent d89f9d70c5 3740f7593d
commit 53a56b7b6c
55 changed files with 83 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_armature.c
View File

@@ -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;