diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:15:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:16:09 +0300 |
| commit | 2e392a0fdc0975e500d7ea07bfbfc781f5ddd190 (patch) | |
| tree | 92d23413d4573fb86f8e3da97e2f0a3f8d55f68d /source/blender/editors/object/object_edit.c | |
| parent | e1b8645c6adfb925c0c16abfb0241968d58081b4 (diff) | |
| parent | c00e1f68e9b81cc4972dabb869d1b6993a3bc767 (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 2723198b279..c5f55b138a6 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1197,7 +1197,7 @@ static int forcefield_toggle_exec(bContext *C, wmOperator *UNUSED(op)) Object *ob = CTX_data_active_object(C); if (ob->pd == NULL) - ob->pd = object_add_collision_fields(PFIELD_FORCE); + ob->pd = BKE_partdeflect_new(PFIELD_FORCE); else if (ob->pd->forcefield == 0) ob->pd->forcefield = PFIELD_FORCE; else |