Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Manta: Fix using path as an input and output

Browse Source 
It is not guaranteed that the function will give correct result
in such an overlapping inputs.

@sebbas please verify this.
This commit is contained in:
Sergey Sharybin
2019-12-17 09:44:27 +01:00
parent 7d2d2ffa76
commit bde06da223
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
intern/mantaflow/intern/MANTA_main.cpp
View File

@@ -1784,20 +1784,16 @@ void MANTA::exportSmokeScript(FluidModifierData *mmd)
if (with_debug)
std::cout << "MANTA::exportSmokeScript()" << std::endl;
char cacheDirScript[FILE_MAX];
cacheDirScript[0] = '\0';
char cacheDir[FILE_MAX] = "\0";
char cacheDirScript[FILE_MAX] = "\0";
BLI_path_join(cacheDirScript,
sizeof(cacheDirScript),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_SCRIPT,
NULL);
BLI_path_make_safe(cacheDirScript);
BLI_dir_create_recursive(
cacheDirScript); /* Create 'script' subdir if it does not exist already */
BLI_path_join(
cacheDirScript, sizeof(cacheDirScript), cacheDirScript, FLUID_DOMAIN_SMOKE_SCRIPT, NULL);
BLI_path_make_safe(cacheDirScript);
cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_SCRIPT, NULL);
BLI_path_make_safe(cacheDir);
/* Create 'script' subdir if it does not exist already */
BLI_dir_create_recursive(cacheDir);
BLI_path_join(cacheDirScript, sizeof(cacheDirScript), cacheDir, FLUID_DOMAIN_SMOKE_SCRIPT, NULL);
BLI_path_make_safe(cacheDir);
bool noise = mmd->domain->flags & FLUID_DOMAIN_USE_NOISE;
bool heat = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_HEAT;
@@ -1891,19 +1887,16 @@ void MANTA::exportLiquidScript(FluidModifierData *mmd)
if (with_debug)
std::cout << "MANTA::exportLiquidScript()" << std::endl;
char cacheDirScript[FILE_MAX];
cacheDirScript[0] = '\0';
char cacheDir[FILE_MAX] = "\0";
char cacheDirScript[FILE_MAX] = "\0";
BLI_path_join(cacheDirScript,
sizeof(cacheDirScript),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_SCRIPT,
NULL);
BLI_path_make_safe(cacheDirScript);
BLI_dir_create_recursive(
cacheDirScript); /* Create 'script' subdir if it does not exist already */
BLI_path_join(
cacheDirScript, sizeof(cacheDirScript), cacheDirScript, FLUID_DOMAIN_LIQUID_SCRIPT, NULL);
cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_SCRIPT, NULL);
BLI_path_make_safe(cacheDir);
/* Create 'script' subdir if it does not exist already */
BLI_dir_create_recursive(cacheDir);
BLI_path_join(
cacheDirScript, sizeof(cacheDirScript), cacheDir, FLUID_DOMAIN_LIQUID_SCRIPT, NULL);
BLI_path_make_safe(cacheDirScript);
bool mesh = mmd->domain->flags & FLUID_DOMAIN_USE_MESH;