Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jul 2018 02:12:36 +0000 (12:12 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jul 2018 02:12:36 +0000 (12:12 +1000)
1  2 
intern/cycles/kernel/kernel_light.h
source/blender/editors/space_file/file_panels.c

Simple merge
index cf8a5b9e1f251df5cc05ac1754ffdfd66710acf1,a40334098d7ce29f2fde009c776b328e00bcf4c8..cbf685e6ed851244864ae43e2a6a9370f0fcb67c
@@@ -80,7 -80,7 +80,7 @@@ static void file_panel_operator(const b
        UI_block_func_set(uiLayoutGetBlock(pa->layout), file_draw_check_cb, NULL, NULL);
  
        /* Hack: temporary hide.*/
-       const char *hide[4] = {"filepath", "files", "directory", "filename"};
 -      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) {