diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:25:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 11:25:49 +0300 |
| commit | f1bc8991461fcda33eb34820bd3aa153f6122c5b (patch) | |
| tree | f6e2c533feeff8a9cf0ff36aef8035e95a5e0f0b /source/blender/editors/object/object_modes.c | |
| parent | 55b241d32a2c3192a439c51aff99a0a248ca9ef2 (diff) | |
| parent | 9636cab0098f96b9c6b6493fb7120f32d7506cd6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_modes.c')
| -rw-r--r-- | source/blender/editors/object/object_modes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c index 3fb0e75a01e..7a30c154f23 100644 --- a/source/blender/editors/object/object_modes.c +++ b/source/blender/editors/object/object_modes.c @@ -206,7 +206,7 @@ static bool ed_object_mode_generic_exit_ex( if (only_test) { return true; } - ED_object_editmode_exit_ex(NULL, scene, ob, EM_FREEDATA); + ED_object_editmode_exit_ex(scene, ob, EM_FREEDATA); } } else if (ob->mode & OB_MODE_VERTEX_PAINT) { |