Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-02-21 17:30:52 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-02-21 17:30:52 +0300
commitf2b0aef4dc6a36d4de6b308e3cb386f44c82d8c0 (patch)
tree1522598f675f3bc54d127f5cabfad37bd5023a0c /source/blender
parentb8af5e10620fe92f45c5e5003bfb6ef8d91e29bb (diff)
Fluid: Cleanup in cache delete function
Removed unneccessary calls to BLI_exists() as BLI_delete() does this implicitly.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/fluid.c35
1 files changed, 14 insertions, 21 deletions
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;