Skip to content

Commit e4e73fa

Browse files
authored
Merge branch 'production' into fixCollisionReport
2 parents 2cf7c56 + c26cfcf commit e4e73fa

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

docs/source/changelog.rst

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Version 0.149.1
77
===============
88

99
- Fix `FindFirstMatchingLinkIndex` and `FindSecondMatchingLinkIndex` in `CollisionPairInfo`
10+
- Set jitterer's `_busebiasing` flag to `false` in the beginning when receiving `SetManipulatorBias` command. The flag will be set to `true` after confirming that the requested manipulator exists and `vbiasdirection` is non-zero. This is because when the provided `vbiasdirection` is a zero vector, the intention is most likely to not use biasing.
1011

1112
Version 0.149.0
1213
===============

plugins/configurationcache/configurationjitterer.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,9 @@ By default will sample the robot's active DOFs. Parameters part of the interface
374374

375375
virtual bool SetManipulatorBiasCommand(std::ostream& sout, std::istream& sinput)
376376
{
377+
// First, reset the flag so that we turn off biasing. We will turn it on again if inputs are valid.
378+
_busebiasing = false;
379+
377380
std::string manipname;
378381
Vector vbiasdirection(0,0,0.1);
379382
dReal nullsampleprob = 0.60, nullbiassampleprob = 0.50, deltasampleprob = 0.50;

0 commit comments

Comments
 (0)