[Bf-blender-cvs] [f27ecd56ef1] master: Cleanup: BKE_scene_free should not have to worry about cleaning its usages.

Bastien Montagne noreply at git.blender.org
Tue Jun 12 17:48:20 CEST 2018


Commit: f27ecd56ef1a2d7f7464bbafb8f3625729a355e3
Author: Bastien Montagne
Date:   Tue Jun 12 17:46:16 2018 +0200
Branches: master
https://developer.blender.org/rBf27ecd56ef1a2d7f7464bbafb8f3625729a355e3

Cleanup: BKE_scene_free should not have to worry about cleaning its usages.

This is supposed to be handled by calling code! Henceforce, no need to
call BKE_sequencer_clear_scene_in_allseqs() here, and... no need for
that ugly G.main case. ;)

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

M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 24daae2cc71..69199d62556 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -458,9 +458,6 @@ void BKE_scene_free(Scene *sce)
 
 	BKE_animdata_free((ID *)sce, false);
 
-	/* check all sequences */
-	BKE_sequencer_clear_scene_in_allseqs(G.main, sce);
-
 	sce->basact = NULL;
 	BLI_freelistN(&sce->base);
 	BKE_sequencer_editing_free(sce, false);



More information about the Bf-blender-cvs mailing list