diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-15 13:03:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-15 13:03:09 +0300 |
| commit | 9e2ea6c500a3a5774a1aa174b6801d3a9edadd9a (patch) | |
| tree | 25e8fd41033e82b6cb04a00b52390f899dc085e5 /source/blender/editors/object/object_transform.c | |
| parent | f3a8f97fcfa39d5dfe3e1f9d1b534e4f42ba9689 (diff) | |
| parent | 0f2efce6c50718d7745a6dc1613acf62a186cc05 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_transform.c')
| -rw-r--r-- | source/blender/editors/object/object_transform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index bb23f871a25..d0ebb0cd6fe 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -545,7 +545,7 @@ static int apply_objects_internal( BKE_mesh_calc_normals(me); } else if (ob->type == OB_ARMATURE) { - ED_armature_apply_transform(ob, mat, do_props); + ED_armature_transform_apply(ob, mat, do_props); } else if (ob->type == OB_LATTICE) { Lattice *lt = ob->data; |