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:
authorBastien Montagne <montagne29@wanadoo.fr>2017-06-15 13:57:08 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-06-15 13:57:08 +0300
commitee5ed2ae26bd86ac843fd9220ae0e5fa721fa33f (patch)
tree401dfc24dd71ca4e37f4978f27e2ba352c2fb8ba /source/blender/editors/screen
parent2bd51474a440aaa2f3a7a90b2e3da663f2fc1f42 (diff)
Fix dangerous code when deleting Scene.
That one was probably not an actual issue, except maybe in some corner cases (like deleting a linked scene also used by some other linked scene). Again, better not try to do smart & complex freeing logic outside of BKE_library area, let's keep spaghetti nitghmare in a single place!
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_edit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 7d2b77028fc..acc396e42fd 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1762,7 +1762,7 @@ bool ED_screen_delete_scene(bContext *C, Scene *scene)
BKE_libblock_remap(bmain, scene, newscene, ID_REMAP_SKIP_INDIRECT_USAGE | ID_REMAP_SKIP_NEVER_NULL_USAGE);
- BKE_libblock_free(bmain, scene);
+ BKE_libblock_free_us(bmain, scene);
return true;
}