diff options
| author | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-03-15 21:57:06 +0300 |
|---|---|---|
| committer | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-03-15 21:57:06 +0300 |
| commit | 5c64aa25541b973db4ec90c97e30b02d09b00075 (patch) | |
| tree | 0cd3a8912d8b0cbfc5fe0bb94a2a42751e98dcd6 /source/blender/editors/util/ed_util.c | |
| parent | 2a1a6bc5720a4310e42a67754998e0480bf7c59b (diff) | |
| parent | 225027ce5dea3785626908b58b01fb3959cf8362 (diff) | |
Merge branch 'master' into soc-2014-fluid
Diffstat (limited to 'source/blender/editors/util/ed_util.c')
| -rw-r--r-- | source/blender/editors/util/ed_util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index ec0471da8d3..438eb1f3864 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -174,7 +174,7 @@ bool ED_editors_flush_edits(const bContext *C, bool for_render) } else { /* Set reorder=false so that saving the file doesn't reorder - * the BMesh's elements */ + * the BMesh's elements */ BKE_sculptsession_bm_to_me(ob, false); } } @@ -218,8 +218,8 @@ void unpack_menu(bContext *C, const char *opname, const char *id_name, const cha char line[FILE_MAX + 100]; wmOperatorType *ot = WM_operatortype_find(opname, 1); - pup = uiPupMenuBegin(C, IFACE_("Unpack File"), ICON_NONE); - layout = uiPupMenuLayout(pup); + pup = UI_popup_menu_begin(C, IFACE_("Unpack File"), ICON_NONE); + layout = UI_popup_menu_layout(pup); props_ptr = uiItemFullO_ptr(layout, ot, IFACE_("Remove Pack"), ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); @@ -231,7 +231,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 (strcmp(abs_name, local_name) != 0) { + if (!STREQ(abs_name, local_name)) { switch (checkPackedFile(local_name, pf)) { case PF_NOFILE: BLI_snprintf(line, sizeof(line), IFACE_("Create %s"), local_name); @@ -295,7 +295,7 @@ void unpack_menu(bContext *C, const char *opname, const char *id_name, const cha break; } - uiPupMenuEnd(C, pup); + UI_popup_menu_end(C, pup); } /* ********************* generic callbacks for drawcall api *********************** */ |