[Bf-blender-cvs] [98dfb4dd1c8] master: Allow deletion of directories in the file browser

Robert Guetzkow noreply at git.blender.org
Tue Nov 26 18:55:25 CET 2019


Commit: 98dfb4dd1c8c64d1ead6ad166fad02ca36c35b1e
Author: Robert Guetzkow
Date:   Tue Nov 26 18:46:31 2019 +0100
Branches: master
https://developer.blender.org/rB98dfb4dd1c8c64d1ead6ad166fad02ca36c35b1e

Allow deletion of directories in the file browser

This diff allows to delete directories in the file browser. The commit https://developer.blender.org/rB8825250f5a85c0c16e74ed144dd2b4a7d752042f did not include this feature.

Reviewed By: Severin

Differential Revision: https://developer.blender.org/D6083

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

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

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

diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 3cdcc07f081..b26769f2118 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -2468,7 +2468,7 @@ static bool file_delete_poll(bContext *C)
       poll = 0;
     }
     for (i = 0; i < numfiles; i++) {
-      if (filelist_entry_select_index_get(sfile->files, i, CHECK_FILES)) {
+      if (filelist_entry_select_index_get(sfile->files, i, CHECK_ALL)) {
         num_selected++;
       }
     }
@@ -2498,7 +2498,7 @@ int file_delete_exec(bContext *C, wmOperator *op)
   bool report_error = false;
   errno = 0;
   for (i = 0; i < numfiles; i++) {
-    if (filelist_entry_select_index_get(sfile->files, i, CHECK_FILES)) {
+    if (filelist_entry_select_index_get(sfile->files, i, CHECK_ALL)) {
       file = filelist_file(sfile->files, i);
       BLI_make_file_string(BKE_main_blendfile_path(bmain), str, sfile->params->dir, file->relpath);
       if (BLI_delete_soft(str, &error_message) != 0 || BLI_exists(str)) {



More information about the Bf-blender-cvs mailing list