diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-08-14 16:49:14 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-08-14 16:54:58 +0300 |
| commit | 5fafd493c2e871e9ce20ab31aea79d332b3bdfb6 (patch) | |
| tree | b7ef45a1477ca1c5256b6e2517940cb882c4a3d7 /source/blender/editors/screen/screen_ops.c | |
| parent | a662980f31168f3d38e0475ad48025d4efa8d4e6 (diff) | |
Fix unnecessarily added undo steps when deleting only scene
Steps to reproduce were: startup.blend, move any object, delete active scene (nothing happens), undo (nothing happens), second undo is needed to revert object transformation
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 1d31cc04e38..1309fb103e9 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3986,7 +3986,9 @@ static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - ED_screen_delete_scene(C, scene); + if (ED_screen_delete_scene(C, scene) == false) { + return OPERATOR_CANCELLED; + } if (G.debug & G_DEBUG) printf("scene delete %p\n", scene); |