Commit: 8aa6e4d50bfcc0d83985f783228408586b0f877b
Author: Sybren A. Stüvel
Date:   Wed Apr 11 15:06:42 2018 +0200
Branches: master
https://developer.blender.org/rB8aa6e4d50bfcc0d83985f783228408586b0f877b

Changed assertion of '..' in file browser entries

The previous assert assumed '..' is always there, which isn't necessarily
true (for example when in the root of an Asset Engine repository).

The new code asserts that if '..' is present it should be the first entry
(rather than forcing the first entry to be '..').

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

M       source/blender/editors/space_file/file_draw.c

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

diff --git a/source/blender/editors/space_file/file_draw.c 
b/source/blender/editors/space_file/file_draw.c
index 52d01063175..396f3cf32f4 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -597,7 +597,7 @@ void file_draw_list(const bContext *C, ARegion *ar)
                                int colorid = (file_selflag & 
FILE_SEL_SELECTED) ? TH_HILITE : TH_BACK;
                                int shade = (params->highlight_file == i) || 
(file_selflag & FILE_SEL_HIGHLIGHTED) ? 35 : 0;
 
-                               BLI_assert(i > 0 || 
FILENAME_IS_CURRPAR(file->relpath));
+                               BLI_assert(i == 0 || 
!FILENAME_IS_CURRPAR(file->relpath));
 
                                draw_tile(sx, sy - 1, layout->tile_w + 4, 
sfile->layout->tile_h + layout->tile_border_y, colorid, shade);
                        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to