[Bf-blender-cvs] [ee5ed2ae26b] master: Fix dangerous code when deleting Scene.

[Bastien Montagne]

Commit: ee5ed2ae26bd86ac843fd9220ae0e5fa721fa33f
Author: Bastien Montagne
Date:   Thu Jun 15 12:57:08 2017 +0200
Branches: master
https://developer.blender.org/rBee5ed2ae26bd86ac843fd9220ae0e5fa721fa33f

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!

===================================================================

M	source/blender/editors/screen/screen_edit.c

===================================================================

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;
 }