archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fluid: Additional fix for relative cache paths

Browse Source 
Added missing conversion from relative to absolute paths.
This commit is contained in:
Sebastián Barschkis
2020-01-14 21:44:32 +01:00
parent 5f8b290eb8
commit f7fa6cd1da
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/physics/physics_fluid.c
View File

@@ -370,6 +370,7 @@ static void fluid_bake_startjob(void *customdata, short *stop, short *do_update,
FluidDomainSettings *mds = job->mmd->domain; FluidDomainSettings *mds = job->mmd->domain;
char temp_dir[FILE_MAX]; char temp_dir[FILE_MAX];
const char *relbase = modifier_path_relbase_from_global(job->ob);
job->stop = stop; job->stop = stop;
job->do_update = do_update; job->do_update = do_update;
@@ -383,6 +384,7 @@ static void fluid_bake_startjob(void *customdata, short *stop, short *do_update,
if (fluid_is_bake_noise(job) || fluid_is_bake_all(job)) { if (fluid_is_bake_noise(job) || fluid_is_bake_all(job)) {
BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_NOISE, NULL); BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_NOISE, NULL);
BLI_path_abs(temp_dir, relbase);
BLI_dir_create_recursive(temp_dir); /* Create 'noise' subdir if it does not exist already */ BLI_dir_create_recursive(temp_dir); /* Create 'noise' subdir if it does not exist already */
mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_NOISE | FLUID_DOMAIN_OUTDATED_NOISE); mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_NOISE | FLUID_DOMAIN_OUTDATED_NOISE);
mds->cache_flag |= FLUID_DOMAIN_BAKING_NOISE; mds->cache_flag |= FLUID_DOMAIN_BAKING_NOISE;
@@ -390,6 +392,7 @@ static void fluid_bake_startjob(void *customdata, short *stop, short *do_update,
} }
if (fluid_is_bake_mesh(job) || fluid_is_bake_all(job)) { if (fluid_is_bake_mesh(job) || fluid_is_bake_all(job)) {
BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_MESH, NULL); BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_MESH, NULL);
BLI_path_abs(temp_dir, relbase);
BLI_dir_create_recursive(temp_dir); /* Create 'mesh' subdir if it does not exist already */ BLI_dir_create_recursive(temp_dir); /* Create 'mesh' subdir if it does not exist already */
mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_MESH | FLUID_DOMAIN_OUTDATED_MESH); mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_MESH | FLUID_DOMAIN_OUTDATED_MESH);
mds->cache_flag |= FLUID_DOMAIN_BAKING_MESH; mds->cache_flag |= FLUID_DOMAIN_BAKING_MESH;
@@ -398,6 +401,7 @@ static void fluid_bake_startjob(void *customdata, short *stop, short *do_update,
if (fluid_is_bake_particle(job) || fluid_is_bake_all(job)) { if (fluid_is_bake_particle(job) || fluid_is_bake_all(job)) {
BLI_path_join( BLI_path_join(
temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_PARTICLES, NULL); temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_PARTICLES, NULL);
BLI_path_abs(temp_dir, relbase);
BLI_dir_create_recursive( BLI_dir_create_recursive(
temp_dir); /* Create 'particles' subdir if it does not exist already */ temp_dir); /* Create 'particles' subdir if it does not exist already */
mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_PARTICLES | FLUID_DOMAIN_OUTDATED_PARTICLES); mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_PARTICLES | FLUID_DOMAIN_OUTDATED_PARTICLES);
@@ -406,6 +410,7 @@ static void fluid_bake_startjob(void *customdata, short *stop, short *do_update,
} }
if (fluid_is_bake_guiding(job) || fluid_is_bake_all(job)) { if (fluid_is_bake_guiding(job) || fluid_is_bake_all(job)) {
BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_GUIDE, NULL); BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_GUIDE, NULL);
BLI_path_abs(temp_dir, relbase);
BLI_dir_create_recursive(temp_dir); /* Create 'guiding' subdir if it does not exist already */ BLI_dir_create_recursive(temp_dir); /* Create 'guiding' subdir if it does not exist already */
mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_GUIDE | FLUID_DOMAIN_OUTDATED_GUIDE); mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_GUIDE | FLUID_DOMAIN_OUTDATED_GUIDE);
mds->cache_flag |= FLUID_DOMAIN_BAKING_GUIDE; mds->cache_flag |= FLUID_DOMAIN_BAKING_GUIDE;
@@ -413,9 +418,11 @@ static void fluid_bake_startjob(void *customdata, short *stop, short *do_update,
} }
if (fluid_is_bake_data(job) || fluid_is_bake_all(job)) { if (fluid_is_bake_data(job) || fluid_is_bake_all(job)) {
BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_CONFIG, NULL); BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_CONFIG, NULL);
BLI_path_abs(temp_dir, relbase);
BLI_dir_create_recursive(temp_dir); /* Create 'config' subdir if it does not exist already */ BLI_dir_create_recursive(temp_dir); /* Create 'config' subdir if it does not exist already */
BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_DATA, NULL); BLI_path_join(temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_DATA, NULL);
BLI_path_abs(temp_dir, relbase);
BLI_dir_create_recursive(temp_dir); /* Create 'data' subdir if it does not exist already */ BLI_dir_create_recursive(temp_dir); /* Create 'data' subdir if it does not exist already */
mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_DATA | FLUID_DOMAIN_OUTDATED_DATA); mds->cache_flag &= ~(FLUID_DOMAIN_BAKED_DATA | FLUID_DOMAIN_OUTDATED_DATA);
mds->cache_flag |= FLUID_DOMAIN_BAKING_DATA; mds->cache_flag |= FLUID_DOMAIN_BAKING_DATA;
@@ -424,6 +431,7 @@ static void fluid_bake_startjob(void *customdata, short *stop, short *do_update,
if (mds->flags & FLUID_DOMAIN_EXPORT_MANTA_SCRIPT) { if (mds->flags & FLUID_DOMAIN_EXPORT_MANTA_SCRIPT) {
BLI_path_join( BLI_path_join(
temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_SCRIPT, NULL); temp_dir, sizeof(temp_dir), mds->cache_directory, FLUID_DOMAIN_DIR_SCRIPT, NULL);
BLI_path_abs(temp_dir, relbase);
BLI_dir_create_recursive(temp_dir); /* Create 'script' subdir if it does not exist already */ BLI_dir_create_recursive(temp_dir); /* Create 'script' subdir if it does not exist already */
} }
} }