[Bf-blender-cvs] [06cc89d] master: Fix T43976: Edit-mode crash /w (scene/screen.scene) mismatch
Campbell Barton
noreply at git.blender.org
Sun Mar 15 23:59:25 CET 2015
Commit: 06cc89d744e0f432ab79a2e4283dd31de6c09d03
Author: Campbell Barton
Date: Mon Mar 16 09:57:15 2015 +1100
Branches: master
https://developer.blender.org/rB06cc89d744e0f432ab79a2e4283dd31de6c09d03
Fix T43976: Edit-mode crash /w (scene/screen.scene) mismatch
===================================================================
M 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 e14b303..f7d51eb 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;
}
}
More information about the Bf-blender-cvs
mailing list