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:
authorJulian Eisel <eiseljulian@gmail.com>2017-10-24 19:22:42 +0300
committerJulian Eisel <eiseljulian@gmail.com>2017-10-24 19:22:42 +0300
commit03f1b94e0238899757579ade582e2e69ad4e0a01 (patch)
tree21f92b17e7206e030f0055d588162b99307bafa3 /source/blender/blenkernel/intern/blendfile.c
parent3936ba9725b0fd85aadbe844b4742e8088471b47 (diff)
Fix crash changing settings of operator executed in different scene
Steps to reproduce were: * Open Blender, create a new scene * Go back to initial scene, transform object * Switch back to newly created scene, change operator settings there * Should cause a crash (at least with asan) Should behave like 2.7 now, that is, switch scene back to where operator was executed.
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile.c')
-rw-r--r--source/blender/blenkernel/intern/blendfile.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index e1350aa8a46..211f92c2e78 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -216,6 +216,7 @@ static void setup_app_data(
wmWindowManager *wm = bfd->main->wm.first;
if (wm_scene_is_visible(wm, bfd->curscene) == false) {
curscene = bfd->curscene;
+ win->scene = curscene;
BKE_screen_view3d_scene_sync(curscreen, curscene);
}
}