diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
| commit | 7439919ac0c4b0146cfed0ddbb8b945fe3675bcb (patch) | |
| tree | 39730e1c17f939bd12e465ce597e2f24bbd91d34 /source/blender/blenkernel/intern/armature.c | |
| parent | dbca1afefa700f25198761624cdb9f1fd21095d2 (diff) | |
| parent | eeb9e5316a615f0e5052b28eee4966c4e2ed1152 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 6f04be653d1..38b98f1eee6 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -149,7 +149,7 @@ void BKE_armature_make_local(Main *bmain, bArmature *arm, const bool lib_local) BKE_id_make_local_generic(bmain, &arm->id, true, lib_local); } -static void copy_bonechildren(Bone *newBone, Bone *oldBone, Bone *actBone, Bone **newActBone) +static void copy_bonechildren(Bone *newBone, const Bone *oldBone, const Bone *actBone, Bone **newActBone) { Bone *curBone, *newChildBone; @@ -171,7 +171,7 @@ static void copy_bonechildren(Bone *newBone, Bone *oldBone, Bone *actBone, Bone } } -bArmature *BKE_armature_copy(Main *bmain, bArmature *arm) +bArmature *BKE_armature_copy(Main *bmain, const bArmature *arm) { bArmature *newArm; Bone *oldBone, *newBone; |