diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:58:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:58:31 +0300 |
| commit | 43eebdfebd6e31d188ae3c1b220c8991fc869df3 (patch) | |
| tree | 5adc929ce792f2dfd74276838e63d91fcddb9a1c /source/blender/editors/object/object_shapekey.c | |
| parent | c98b2e74df2e531726f5ceabe76342282f695f23 (diff) | |
| parent | be57cf9b2a0e1be577211839487cacd288886c1a (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
Diffstat (limited to 'source/blender/editors/object/object_shapekey.c')
| -rw-r--r-- | source/blender/editors/object/object_shapekey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 03fe6e9de65..4f985293ec3 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -78,8 +78,9 @@ static void ED_object_shape_key_add(bContext *C, Object *ob, const bool from_mix) { + Main *bmain = CTX_data_main(C); KeyBlock *kb; - if ((kb = BKE_object_shapekey_insert(ob, NULL, from_mix))) { + if ((kb = BKE_object_shapekey_insert(bmain, ob, NULL, from_mix))) { Key *key = BKE_key_from_object(ob); /* for absolute shape keys, new keys may not be added last */ ob->shapenr = BLI_findindex(&key->block, kb) + 1; |