From 06cc89d744e0f432ab79a2e4283dd31de6c09d03 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 16 Mar 2015 09:57:15 +1100 Subject: Fix T43976: Edit-mode crash /w (scene/screen.scene) mismatch --- source/blender/editors/object/object_edit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/object/object_edit.c') 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; } } -- cgit v1.2.3