diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:42:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:47:02 +0300 |
| commit | 222a941a2bbd71dcaa1012cdea959954ca065c6a (patch) | |
| tree | 798c5a245de42556afabc91d8a7c45eb61337b04 /source/blender/editors/object/object_edit.c | |
| parent | 872df463f62d55911a2a732775a8de434c281b2d (diff) | |
| parent | 28f86bf117e9d9d10089ef758a5ec4ade65084c6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index cbfad27f8a2..9d8bd4a8718 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -912,7 +912,7 @@ static void copy_attr(Main *bmain, Scene *scene, ViewLayer *view_layer, short ev } else if (event == 26) { #if 0 // XXX old animation system - copy_nlastrips(&base->object->nlastrips, &ob->nlastrips); + BKE_nlastrip_copy(s(&base->object->nlastrips, &ob->nlastrips); #endif // XXX old animation system } else if (event == 27) { /* autosmooth */ |