diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /source/blender/editors/object/object_lattice.c | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'source/blender/editors/object/object_lattice.c')
| -rw-r--r-- | source/blender/editors/object/object_lattice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index c24a127ed8b..b577dab8a77 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -100,7 +100,7 @@ void make_editLatt(Object *obedit) actkey = BKE_keyblock_from_object(obedit); if (actkey) - BKE_key_convert_to_lattice(actkey, lt); + BKE_keyblock_convert_to_lattice(actkey, lt); lt->editlatt = MEM_callocN(sizeof(EditLatt), "editlatt"); lt->editlatt->latt = MEM_dupallocN(lt); |