[Bf-blender-cvs] [f2b0aef4dc6] master: Fluid: Cleanup in cache delete function

[Sebastián Barschkis]

Commit: f2b0aef4dc6a36d4de6b308e3cb386f44c82d8c0
Author: Sebastián Barschkis
Date:   Fri Feb 21 15:30:52 2020 +0100
Branches: master
https://developer.blender.org/rBf2b0aef4dc6a36d4de6b308e3cb386f44c82d8c0

Fluid: Cleanup in cache delete function

Removed unneccessary calls to BLI_exists() as BLI_delete() does this implicitly.

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

M	source/blender/blenkernel/intern/fluid.c

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 1d44604384a..7c5e9af728a 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -339,37 +339,32 @@ void BKE_fluid_cache_free(FluidDomainSettings *mds, Object *ob, int cache_map)
     flags &= ~(FLUID_DOMAIN_BAKING_DATA | FLUID_DOMAIN_BAKED_DATA | FLUID_DOMAIN_OUTDATED_DATA);
     BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_CONFIG, NULL);
     BLI_path_abs(temp_dir, relbase);
-    if (BLI_exists(temp_dir)) {
-      BLI_delete(temp_dir, true, true);
-    }
+    BLI_delete(temp_dir, true, true); /* BLI_exists(filepath) is implicit */
+
     BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_DATA, NULL);
     BLI_path_abs(temp_dir, relbase);
-    if (BLI_exists(temp_dir)) {
-      BLI_delete(temp_dir, true, true);
-    }
+    BLI_delete(temp_dir, true, true); /* BLI_exists(filepath) is implicit */
+
     BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_SCRIPT, NULL);
     BLI_path_abs(temp_dir, relbase);
-    if (BLI_exists(temp_dir)) {
-      BLI_delete(temp_dir, true, true);
-    }
+    BLI_delete(temp_dir, true, true); /* BLI_exists(filepath) is implicit */
+
     mds->cache_frame_pause_data = 0;
   }
   if (cache_map & FLUID_DOMAIN_OUTDATED_NOISE) {
     flags &= ~(FLUID_DOMAIN_BAKING_NOISE | FLUID_DOMAIN_BAKED_NOISE | FLUID_DOMAIN_OUTDATED_NOISE);
     BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_NOISE, NULL);
     BLI_path_abs(temp_dir, relbase);
-    if (BLI_exists(temp_dir)) {
-      BLI_delete(temp_dir, true, true);
-    }
+    BLI_delete(temp_dir, true, true); /* BLI_exists(filepath) is implicit */
+
     mds->cache_frame_pause_noise = 0;
   }
   if (cache_map & FLUID_DOMAIN_OUTDATED_MESH) {
     flags &= ~(FLUID_DOMAIN_BAKING_MESH | FLUID_DOMAIN_BAKED_MESH | FLUID_DOMAIN_OUTDATED_MESH);
     BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_MESH, NULL);
     BLI_path_abs(temp_dir, relbase);
-    if (BLI_exists(temp_dir)) {
-      BLI_delete(temp_dir, true, true);
-    }
+    BLI_delete(temp_dir, true, true); /* BLI_exists(filepath) is implicit */
+
     mds->cache_frame_pause_mesh = 0;
   }
   if (cache_map & FLUID_DOMAIN_OUTDATED_PARTICLES) {
@@ -378,9 +373,8 @@ void BKE_fluid_cache_free(FluidDomainSettings *mds, Object *ob, int cache_map)
     BLI_path_join(
         temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_PARTICLES, NULL);
     BLI_path_abs(temp_dir, relbase);
-    if (BLI_exists(temp_dir)) {
-      BLI_delete(temp_dir, true, true);
-    }
+    BLI_delete(temp_dir, true, true); /* BLI_exists(filepath) is implicit */
+
     mds->cache_frame_pause_particles = 0;
   }
 
@@ -388,9 +382,8 @@ void BKE_fluid_cache_free(FluidDomainSettings *mds, Object *ob, int cache_map)
     flags &= ~(FLUID_DOMAIN_BAKING_GUIDE | FLUID_DOMAIN_BAKED_GUIDE | FLUID_DOMAIN_OUTDATED_GUIDE);
     BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_GUIDE, NULL);
     BLI_path_abs(temp_dir, relbase);
-    if (BLI_exists(temp_dir)) {
-      BLI_delete(temp_dir, true, true);
-    }
+    BLI_delete(temp_dir, true, true); /* BLI_exists(filepath) is implicit */
+
     mds->cache_frame_pause_guide = 0;
   }
   mds->cache_flag = flags;