undo changes the active scene #43424

New Issue

Nahuel Belich · 2015-01-27T06:04:53+01:00

Nahuel Belich commented

2015-01-27 06:04:53 +01:00

System Information
Win 7x64
Nvidia 460

Blender Version
Broken: from 2.72a official(at least) up to Hash:59e2f91

Short description of error
Working with mutliple scenes, undo some action and the scene its change if it is not the original.
Example,
Three scenes A B C, working in scene C do undo and blender switch automatically to scene A

Exact steps for others to reproduce the error
1-open file undo_escenes_bug.blend
2-go to the window that has the ico spheres
3-move an sphere, to have something to undo
4-Ctrl+z undo
5- you should be watching monkeys on that window too

**System Information** Win 7x64 Nvidia 460 **Blender Version** Broken: from 2.72a official(at least) up to Hash:59e2f91 **Short description of error** Working with mutliple scenes, undo some action and the scene its change if it is not the original. Example, Three scenes A B C, working in scene C do undo and blender switch automatically to scene A **Exact steps for others to reproduce the error** 1-open file [undo_escenes_bug.blend](https://archive.blender.org/developer/F139546/undo_escenes_bug.blend) 2-go to the window that has the ico spheres 3-move an sphere, to have something to undo 4-Ctrl+z undo 5- you should be watching monkeys on that window too

Nahuel Belich commented

2015-01-27 06:04:54 +01:00

Changed status to: 'Open'

Nahuel Belich commented

2015-01-27 06:04:54 +01:00

Added subscriber: @NahuelBelich

Sergey Sharybin commented

2015-01-27 10:34:44 +01:00

Added subscriber: @Sergey

Sergey Sharybin commented

2015-01-27 10:35:01 +01:00

Added subscriber: @JulianEisel

Sergey Sharybin commented

2015-01-27 10:35:01 +01:00

@JulianEisel, would guess it's a nice puzzle for you? :)

Nahuel Belich commented

2015-01-27 12:56:23 +01:00

just came up with a different situation but same bug,
on the step 1-fille above.
2-create a lamp
3-Ctrl+G to add the lamp to a group
4-F6 to access last operator options
5-change the name of the group
6-Accept the change using the key intro on the keyboard
7-switch to the original scene, just as the undo

just came up with a different situation but same bug, on the step 1-fille above. 2-create a lamp 3-Ctrl+G to add the lamp to a group 4-F6 to access last operator options 5-change the name of the group 6-Accept the change using the key intro on the keyboard 7-switch to the original scene, just as the undo

Julian Eisel commented

2015-02-09 18:26:05 +01:00

Added subscriber: @ideasman42

Julian Eisel commented

2015-02-09 18:26:05 +01:00

This diff should fix the issue:
P195: Possible fix for #43424

diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index fb02af1..5ad66d3 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -236,7 +236,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath
                /* we re-use current screen */
                curscreen = CTX_wm_screen(C);
                /* but use new Scene pointer */
-               curscene = bfd->curscene;
+               curscene = curscreen ? curscreen->scene : bfd->curscene;
                if (curscene == NULL) curscene = bfd->main->scene.first;
                /* empty file, we add a scene to make Blender work */
                if (curscene == NULL) curscene = BKE_scene_add(bfd->main, "Empty");

@ideasman42, would like to get your permission on this. Do you see anything against this?

This diff should fix the issue: [P195: Possible fix for #43424](https://archive.blender.org/developer/P195.txt) ``` diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index fb02af1..5ad66d3 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -236,7 +236,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath /* we re-use current screen */ curscreen = CTX_wm_screen(C); /* but use new Scene pointer */ - curscene = bfd->curscene; + curscene = curscreen ? curscreen->scene : bfd->curscene; if (curscene == NULL) curscene = bfd->main->scene.first; /* empty file, we add a scene to make Blender work */ if (curscene == NULL) curscene = BKE_scene_add(bfd->main, "Empty"); ``` @ideasman42, would like to get your permission on this. Do you see anything against this?

Julian Eisel self-assigned this 2015-02-09 18:26:29 +01:00

Sergey Sharybin commented

2015-02-09 18:33:59 +01:00

Is it guaranteed screen uses an updated pointer? For example: remove scene, undo, redo might make some scene pointers invalid.

blender-admin commented

2015-02-09 19:51:05 +01:00

This issue was referenced by 31e26bb83b

This issue was referenced by 31e26bb83bd0a538c76fd8bb6ebce65027dde94c

Campbell Barton commented

2015-02-09 19:52:42 +01:00

Changed status from 'Open' to: 'Resolved'

Campbell Barton closed this issue

2015-02-09 19:52:42 +01:00

Campbell Barton commented

2015-02-09 19:52:42 +01:00

Closed by commit 31e26bb83b.

Closed by commit 31e26bb83b.

Campbell Barton commented

2015-02-09 19:58:05 +01:00

@JulianEisel, the problem with this patch (aside from sergey's point which is also a problem) is you don't always wan't the scene to remain unchanged,
If you keep the current scene the user may have performed actions in a different scene and undo operations without being able to view them.

Fix needed to be a bit more involved because undo wasn't using the active window to define bfd->curscene
See comments from commit.

@JulianEisel, the problem with this patch (aside from sergey's point which is also a problem) is you don't *always* wan't the scene to remain unchanged, If you keep the current scene the user may have performed actions in a different scene and undo operations without being able to view them. Fix needed to be a bit more involved because undo wasn't using the active window to define `bfd->curscene` See comments from commit.

Julian Eisel commented

2015-02-09 20:13:41 +01:00

Yeah, saw the commit and it totally makes sense (well of course it does ;) ). I got some crashes for the reason @Sergey mentioned and didn't found a good solution, but your patch seems to handle this well.

There is one issue I noticed with the commit: Add new scene, undo -> camera isn't active anymore. Not sure where the connection is...

Yeah, saw the commit and it totally makes sense (well of course it does ;) ). I got some crashes for the reason @Sergey mentioned and didn't found a good solution, but your patch seems to handle this well. There is one issue I noticed with the commit: Add new scene, undo -> camera isn't active anymore. Not sure where the connection is...

Campbell Barton commented

2015-02-12 10:58:15 +01:00

@JulianEisel, the issue with the camera is crashing here. Seems my fix wasnt fine... think I know the cause ... investigating.

@JulianEisel, the issue with the camera is crashing here. Seems my fix *wasnt* fine... think I know the cause ... investigating.

Campbell Barton commented

2015-02-12 11:35:07 +01:00

Corrected 7f47cd9b17

Corrected 7f47cd9b17

Sign in to join this conversation.

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

undo changes the active scene #43424