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:36:48 +0300 |
| commit | 20b6eabd4282890f2d990fcb31555ff34699d861 (patch) | |
| tree | 0aec2eadb0cae3b299c373d1de6b1eac3e65a31e /source/blender/makesrna/intern/rna_scene_api.c | |
| parent | 8b41999ea0ff7dd873128bcdb2ff422bd46edd2d (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/makesrna/intern/rna_scene_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index ca7d153066f..a3e403154f9 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -197,6 +197,11 @@ static void rna_Scene_ray_cast( } } +static void rna_Scene_sequencer_editing_free(Scene *scene) +{ + BKE_sequencer_editing_free(scene, true); +} + #ifdef WITH_ALEMBIC static void rna_Scene_alembic_export( @@ -331,6 +336,14 @@ void RNA_api_scene(StructRNA *srna) parm = RNA_def_float_matrix(func, "matrix", 4, 4, NULL, 0.0f, 0.0f, "", "Matrix", 0.0f, 0.0f); RNA_def_function_output(func, parm); + /* Sequencer. */ + func = RNA_def_function(srna, "sequence_editor_create", "BKE_sequencer_editing_ensure"); + RNA_def_function_ui_description(func, "Ensure sequence editor is valid in this scene"); + parm = RNA_def_pointer(func, "sequence_editor", "SequenceEditor", "", "New sequence editor data or NULL"); + RNA_def_function_return(func, parm); + + func = RNA_def_function(srna, "sequence_editor_clear", "rna_Scene_sequencer_editing_free"); + RNA_def_function_ui_description(func, "Clear sequence editor in this scene"); #ifdef WITH_ALEMBIC /* XXX Deprecated, will be removed in 2.8 in favour of calling the export operator. */ |