Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-06-23 02:54:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-06-23 04:29:36 +0300
commit716a8241d387180fd8ad69cdec33633bc7a0f963 (patch)
treed4674969beacfa6f9d50726f5943e050a373f2b5 /source/blender/editors/sound/sound_ops.c
parenta573d7e8a14ce5e49b8c05ff762a00e181e905aa (diff)
Cleanup: rename 'name' to 'filepath' for DNA types
Using 'name' for the full path of a file reads badly, especially when id.name is used in related code.
Diffstat (limited to 'source/blender/editors/sound/sound_ops.c')
-rw-r--r--source/blender/editors/sound/sound_ops.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 81ac8a16d8a..2e52f3aa8a8 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -771,7 +771,7 @@ static int sound_pack_exec(bContext *C, wmOperator *op)
}
sound->packedfile = BKE_packedfile_new(
- op->reports, sound->name, ID_BLEND_PATH(bmain, &sound->id));
+ op->reports, sound->filepath, ID_BLEND_PATH(bmain, &sound->id));
BKE_sound_load(bmain, sound);
return OPERATOR_FINISHED;
@@ -847,7 +847,8 @@ static int sound_unpack_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE
"AutoPack is enabled, so image will be packed again on file save");
}
- unpack_menu(C, "SOUND_OT_unpack", sound->id.name + 2, sound->name, "sounds", sound->packedfile);
+ unpack_menu(
+ C, "SOUND_OT_unpack", sound->id.name + 2, sound->filepath, "sounds", sound->packedfile);
return OPERATOR_FINISHED;
}