diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 12:08:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 12:08:02 +0300 |
| commit | 17f458ff320c5c0a0c5cdaeb5da60926d3e03d68 (patch) | |
| tree | a67031752a7f2011e5cd4ee6b761eb0ad1a274e8 /source/blender/editors/util | |
| parent | fcfe1963a622fed257b8b9597424bf11edb19c52 (diff) | |
| parent | 24d1829243c6e41c639c1d0722a13599a7c1927c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/util')
| -rw-r--r-- | source/blender/editors/util/ed_util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 61a70d2da42..6751577bfda 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -241,6 +241,7 @@ void apply_keyb_grid(int shift, int ctrl, float *val, float fac1, float fac2, fl void unpack_menu(bContext *C, const char *opname, const char *id_name, const char *abs_name, const char *folder, struct PackedFile *pf) { + Main *bmain = CTX_data_main(C); PointerRNA props_ptr; uiPopupMenu *pup; uiLayout *layout; @@ -262,7 +263,7 @@ void unpack_menu(bContext *C, const char *opname, const char *id_name, const cha BLI_split_file_part(abs_name, fi, sizeof(fi)); BLI_snprintf(local_name, sizeof(local_name), "//%s/%s", folder, fi); if (!STREQ(abs_name, local_name)) { - switch (checkPackedFile(local_name, pf)) { + switch (checkPackedFile(bmain->name, local_name, pf)) { case PF_NOFILE: BLI_snprintf(line, sizeof(line), IFACE_("Create %s"), local_name); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); @@ -295,7 +296,7 @@ void unpack_menu(bContext *C, const char *opname, const char *id_name, const cha } } - switch (checkPackedFile(abs_name, pf)) { + switch (checkPackedFile(bmain->name, abs_name, pf)) { case PF_NOFILE: BLI_snprintf(line, sizeof(line), IFACE_("Create %s"), abs_name); //uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_ORIGINAL); |