diff options
| author | Antonioya <blendergit@gmail.com> | 2019-07-23 10:46:29 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-07-23 10:46:29 +0300 |
| commit | 2204bfcf9e1c3a38e60830bd97775dd72158f4d6 (patch) | |
| tree | 4f9c827389a23a431f8771b4ca02f410860c0242 /source/blender/editors/sound/sound_ops.c | |
| parent | f64db794ee690f05905ace0a66d81d2e75549b90 (diff) | |
| parent | 34ad6da4a06ef46cd19945f61cc5f968538546a8 (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Diffstat (limited to 'source/blender/editors/sound/sound_ops.c')
| -rw-r--r-- | source/blender/editors/sound/sound_ops.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 30ddd8c7d33..0241a2fbe88 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -104,7 +104,7 @@ static int sound_open_exec(bContext *C, wmOperator *op) } if (RNA_boolean_get(op->ptr, "cache")) { - BKE_sound_cache(sound); + sound->flags |= SOUND_FLAGS_CACHING; } /* hook into UI */ @@ -765,7 +765,8 @@ static int sound_pack_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - sound->packedfile = newPackedFile(op->reports, sound->name, ID_BLEND_PATH(bmain, &sound->id)); + sound->packedfile = BKE_packedfile_new( + op->reports, sound->name, ID_BLEND_PATH(bmain, &sound->id)); BKE_sound_load(bmain, sound); return OPERATOR_FINISHED; @@ -811,7 +812,7 @@ static int sound_unpack_exec(bContext *C, wmOperator *op) "AutoPack is enabled, so image will be packed again on file save"); } - unpackSound(bmain, op->reports, sound, method); + BKE_packedfile_unpack_sound(bmain, op->reports, sound, method); return OPERATOR_FINISHED; } |