diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-21 19:24:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-21 19:26:12 +0300 |
| commit | 31d916210c4e70e8c2dcb54fe0d4d2ba6940842f (patch) | |
| tree | d4a13dc3755ad06cf1be309fcddb83cd41cab06f /source/blender/blenkernel/intern/object.c | |
| parent | 6046d9f71549ee72d26cba0af77a13ff9c53e23e (diff) | |
Cleanup: remove DM from 'join as shape' operator.
Also deduplicated the 'mesh as shapekey' code, we had kind of two funcs
doing the same thing here...
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index c80c679ab73..b389e211e00 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2956,7 +2956,7 @@ static KeyBlock *insert_meshkey(Main *bmain, Object *ob, const char *name, const if (newkey || from_mix == false) { /* create from mesh */ kb = BKE_keyblock_add_ctime(key, name, false); - BKE_keyblock_convert_from_mesh(me, kb); + BKE_keyblock_convert_from_mesh(me, key, kb); } else { /* copy from current values */ |