diff options
| author | Robert Hrusecky <robert.hrusecky@utexas.edu> | 2020-11-02 15:00:12 -0600 |
|---|---|---|
| committer | Robert Hrusecky <robert.hrusecky@utexas.edu> | 2020-11-02 15:00:12 -0600 |
| commit | 8b81a3fd2727dcb911f19c3d7a98c4ec94c6f2fa (patch) | |
| tree | b59ce89ff5d1e0505cdf2b7b91740a48763efa76 /src/geometry/narrow_phase.rs | |
| parent | bcec54ef31d987cf20b493628a20777183a95f65 (diff) | |
| parent | a38fdc101dc74473c45a8b4f5d770f2bc43f30c2 (diff) | |
| download | rapier-8b81a3fd2727dcb911f19c3d7a98c4ec94c6f2fa.tar.gz rapier-8b81a3fd2727dcb911f19c3d7a98c4ec94c6f2fa.tar.bz2 rapier-8b81a3fd2727dcb911f19c3d7a98c4ec94c6f2fa.zip | |
Merge branch 'master' into infinite_fall_memory
Diffstat (limited to 'src/geometry/narrow_phase.rs')
| -rw-r--r-- | src/geometry/narrow_phase.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/geometry/narrow_phase.rs b/src/geometry/narrow_phase.rs index c1bd411..e3e52e5 100644 --- a/src/geometry/narrow_phase.rs +++ b/src/geometry/narrow_phase.rs @@ -424,7 +424,11 @@ impl NarrowPhase { let (generator, workspace) = dispatcher.dispatch(co1.shape().shape_type(), co2.shape().shape_type()); pair.generator = Some(generator); - pair.generator_workspace = workspace; + + // Keep the workspace if one already exists. + if pair.generator_workspace.is_none() { + pair.generator_workspace = workspace; + } } let context = ContactGenerationContext { |