Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-03-02 15:04:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-03-02 15:04:19 +0300
commit35bd1bb957b3c7491875d58d0092eab39c3b4e0e (patch)
treeb4e29938a9f1988413ec311506ebb2f0805865c3 /source/blender/editors/scene
parent437801bec1f4140b255927e6e6c957fa5b453014 (diff)
WorkSpace: move edit mode w/ sync into own func
Diffstat (limited to 'source/blender/editors/scene')
-rw-r--r--source/blender/editors/scene/scene_edit.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c
index cee73c28767..462820c93c0 100644
--- a/source/blender/editors/scene/scene_edit.c
+++ b/source/blender/editors/scene/scene_edit.c
@@ -156,20 +156,8 @@ void ED_scene_change_update(
if (obact_new == obact_old) {
/* pass */
}
- else if (obact_new == NULL) {
- workspace->object_mode = OB_MODE_OBJECT;
- }
else {
- eObjectMode object_mode_set = OB_MODE_OBJECT;
- if (ED_workspace_object_mode_in_other_window(
- bmain->wm.first, win, obact_new, &object_mode_set))
- {
- workspace->object_mode = object_mode_set;
- }
- else {
- workspace->object_mode = OB_MODE_OBJECT;
- ED_object_mode_generic_enter(C, object_mode_old);
- }
+ ED_object_mode_generic_enter_or_other_window(C, object_mode_old);
}