archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: nuke G.main out of BKE PackedFile code.

Browse Source
This commit is contained in:
Bastien Montagne
2018-05-31 11:07:14 +02:00
parent 84a9647f22
commit 24d1829243
6 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/util/ed_util.c
View File

@@ -232,6 +232,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;
@@ -253,7 +254,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);
@@ -286,7 +287,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);