[Bf-blender-cvs] [ee5ecb48f44] asset-browser: Merge branch 'temp-review-asset-browser-ui' into asset-browser

Julian Eisel noreply at git.blender.org
Thu Dec 10 20:30:51 CET 2020


Commit: ee5ecb48f4416b6e659ac58a1713cd3bcf022850
Author: Julian Eisel
Date:   Thu Dec 10 20:27:02 2020 +0100
Branches: asset-browser
https://developer.blender.org/rBee5ecb48f4416b6e659ac58a1713cd3bcf022850

Merge branch 'temp-review-asset-browser-ui' into asset-browser

===================================================================



===================================================================

diff --cc source/blender/editors/space_file/file_draw.c
index 9d1dd2219b0,932301dbf89..f2f7f9d82f9
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@@ -135,8 -135,8 +135,7 @@@ static void draw_tile(int sx, int sy, i
  }
  
  static void file_draw_icon(uiBlock *block,
-                            const struct FileList *files,
                             const FileDirEntry *file,
 -                           const char *rootpath,
                             const char *path,
                             int sx,
                             int sy,
@@@ -293,8 -287,8 +292,7 @@@ void file_calc_previews(const bContext 
  }
  
  static void file_draw_preview(uiBlock *block,
-                               const struct FileList *files,
                                const FileDirEntry *file,
 -                              const char *rootpath,
                                const char *path,
                                int sx,
                                int sy,
@@@ -919,8 -911,8 +917,7 @@@ void file_draw_list(const bContext *C, 
        }
  
        file_draw_preview(block,
-                         files,
                          file,
 -                        root,
                          path,
                          sx,
                          sy,
@@@ -935,8 -927,8 +932,7 @@@
      }
      else {
        file_draw_icon(block,
-                      files,
                       file,
 -                     root,
                       path,
                       sx,
                       sy - layout->tile_border_y,



More information about the Bf-blender-cvs mailing list