Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_file / file_panels.c
index a40334098d7ce29f2fde009c776b328e00bcf4c8..cbf685e6ed851244864ae43e2a6a9370f0fcb67c 100644 (file)
@@ -80,7 +80,7 @@ static void file_panel_operator(const bContext *C, Panel *pa)
        UI_block_func_set(uiLayoutGetBlock(pa->layout), file_draw_check_cb, NULL, NULL);
 
        /* Hack: temporary hide.*/
-       const char *hide[] = {"filepath", "directory", "filename", "files"};
+       const char *hide[] = {"filepath", "files", "directory", "filename"};
        for (int i = 0; i < ARRAY_SIZE(hide); i++) {
                PropertyRNA *prop = RNA_struct_find_property(op->ptr, hide[i]);
                if (prop) {
@@ -88,8 +88,11 @@ static void file_panel_operator(const bContext *C, Panel *pa)
                }
        }
 
-       uiTemplateOperatorPropertyButs(C, pa->layout, op, '\0', UI_TEMPLATE_OP_PROPS_SHOW_EMPTY);
+       uiTemplateOperatorPropertyButs(
+               C, pa->layout, op, UI_BUT_LABEL_ALIGN_NONE,
+               UI_TEMPLATE_OP_PROPS_SHOW_EMPTY);
 
+       /* Hack: temporary hide.*/
        for (int i = 0; i < ARRAY_SIZE(hide); i++) {
                PropertyRNA *prop = RNA_struct_find_property(op->ptr, hide[i]);
                if (prop) {