diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-21 15:37:42 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-21 15:37:42 +0400 |
| commit | c4ee1f265847db4fed34df05a32f4b0fa3612092 (patch) | |
| tree | 75792db986f09f492eaa4576d12e90d0dc669ddd /source/blender/editors/physics | |
| parent | b11dc51974d48738b4e53c9c81971a045d73c5a6 (diff) | |
Fluid simulation manual number of threads option now doesn't set the number
of threads to the number of cores when the fluid is created. Rather it is now
set to 0 which means "use the number of threads specified for the scene".
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 1de2f14dbc0..b2c780cfdbf 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -994,7 +994,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor /* ******** export domain to elbeem ******** */ elbeemResetSettings(fsset); fsset->version = 1; - fsset->threads = domainSettings->threads; + fsset->threads = (domainSettings->threads == 0) ? BKE_scene_num_threads(scene) : domainSettings->threads; // setup global settings copy_v3_v3(fsset->geoStart, domainSettings->bbStart); copy_v3_v3(fsset->geoSize, domainSettings->bbSize); |