diff options
| author | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-03-16 01:05:11 +0300 |
|---|---|---|
| committer | Roman Pogribnyi <pogribnyi@gmail.com> | 2015-03-16 01:05:11 +0300 |
| commit | 79f7f4d5626b322aa035c760cb6890c6c28b777d (patch) | |
| tree | 1b259da5c2cfa0fc571de16d2f9a976395b9b4d2 | |
| parent | 5c64aa25541b973db4ec90c97e30b02d09b00075 (diff) | |
after-merge errors fixed
| -rw-r--r-- | intern/smoke/intern/MANTA.cpp | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp index 6772fb44759..b95626a965d 100644 --- a/intern/smoke/intern/MANTA.cpp +++ b/intern/smoke/intern/MANTA.cpp @@ -257,12 +257,6 @@ void Manta_API::add_mesh_transform_method(stringstream& ss) " obj.offset(gs/2)\n\n"; } -void Manta_API::manta_cache_path(char *filepath) -{ - char *name="manta"; - BLI_make_file_string("/", filepath, BLI_temp_dir_session(), name); -} - void Manta_API::stop_manta_sim() { pthread_cancel(manta_thread); diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 7b3c84f7235..66bb63caf4a 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -210,7 +210,7 @@ void smoke_reallocate_highres_fluid(SmokeDomainSettings *sds, float dx, int res[ /* smoke_turbulence_init uses non-threadsafe functions from fftw3 lib (like fftw_plan & co). */ BLI_lock_thread(LOCK_FFTW); - sds->wt = smoke_turbulence_init(res, sds->amplify + 1, sds->noise, BKE_tempdir_session(), use_fire, use_colors); + sds->wt = smoke_turbulence_init(res, sds->amplify + 1, sds->noise, BKE_tempdir_session(), use_fire, use_colors, sds); BLI_unlock_thread(LOCK_FFTW); @@ -578,7 +578,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd) smd->domain->noise_val_scale = 0.; smd->domain->noise_val_offset = 0.075; smd->domain->noise_time_anim = 0.2; - BLI_make_file_string("/", smd->domain->_manta_filepath, BLI_temp_dir_base(), "manta_scene.py"); + BLI_make_file_string("/", smd->domain->_manta_filepath, BKE_tempdir_base(), "manta_scene.py"); } else if (smd->type & MOD_SMOKE_TYPE_FLOW) { |