diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-16 01:57:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-16 01:57:15 +0300 |
| commit | 06cc89d744e0f432ab79a2e4283dd31de6c09d03 (patch) | |
| tree | ea0ff2cd82d7d36de5587a1eae201c5a89ef6bb3 /source/blender/editors/object/object_edit.c | |
| parent | d49eeabae7a001eaf18e39ca8e373f83798fbdff (diff) | |
Fix T43976: Edit-mode crash /w (scene/screen.scene) mismatch
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index e14b3036743..f7d51eb403f 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -571,8 +571,8 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op) ToolSettings *toolsettings = CTX_data_tool_settings(C); if (!is_mode_set) { - Scene *scene = CTX_data_scene(C); - if (!ED_object_mode_compat_set(C, scene->basact->object, mode_flag, op->reports)) { + Object *ob = CTX_data_active_object(C); + if (!ED_object_mode_compat_set(C, ob, mode_flag, op->reports)) { return OPERATOR_CANCELLED; } } |