From bc788929aa2bd259670a5562a1f403f25cad4625 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 8 Jan 2021 16:30:44 +0100 Subject: Scenes: forbid deleting last local scene Previously, it was only forbidden to delete the last scene. This can lead to the situation where a .blend file only contains linked scenes. This is problematic, because linked data might not always be available or can be removed from a .blend file without having an additional check for remaining scenes. Now there always has to be at least one local scene. Reviewers: mont29 Differential Revision: https://developer.blender.org/D10049 --- source/blender/editors/scene/scene_edit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/scene') diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 47edb322701..2b2a0d10e29 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -240,8 +240,9 @@ static void SCENE_OT_new(wmOperatorType *ot) static bool scene_delete_poll(bContext *C) { + Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - return (scene->id.prev || scene->id.next); + return BKE_scene_can_be_removed(bmain, scene); } static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op)) -- cgit v1.2.3