diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-11 12:21:30 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-11 12:23:11 +0300 |
| commit | d5c1c0b10d5cab0639c0635c8632040dc8b97468 (patch) | |
| tree | 416ab655d0df5a348057bad20ae928c54e2c6a3e /source/blender/blenkernel/intern/scene.c | |
| parent | 13beeb58922747cc1a28bac58ceb1b44820808cd (diff) | |
Fix (unreported) broken freeing code for Sequencer.
Freeing sequencer would always do usercount, which is now forbidden when
called from main ID freeing code.
Annoying in 2.7x, much more critical issue in 2.8!
Also, moved RNA sequencer API functions to proper rna_scene_api.c file.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 9b3299bdbc5..230afbcaeff 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -423,7 +423,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) /* Remove sequencer if not full copy */ /* XXX Why in Hell? :/ */ remove_sequencer_fcurves(sce_copy); - BKE_sequencer_editing_free(sce_copy); + BKE_sequencer_editing_free(sce_copy, true); } /* NOTE: part of SCE_COPY_LINK_DATA and SCE_COPY_FULL operations @@ -463,7 +463,7 @@ void BKE_scene_free(Scene *sce) sce->basact = NULL; BLI_freelistN(&sce->base); - BKE_sequencer_editing_free(sce); + BKE_sequencer_editing_free(sce, false); BKE_keyingsets_free(&sce->keyingsets); |