Skip to content

Commit

Permalink
Revert "Display::load: avoid premature enabling"
Browse files Browse the repository at this point in the history
Some displays, e.g. RobotModelDisplay, rely on the fact that the display is enabled
before loading of its parameters.

This reverts commit 0969fef.
  • Loading branch information
rhaschke committed Sep 1, 2019
1 parent d171d82 commit b78716d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions src/rviz/display_group.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ void DisplayGroup::load( const Config& config )
Config display_config = it->second;
Display* disp = it->first;
disp->initialize( context_ );
// avoid premature enabling of the display from "Value" instead of from "Enabled"
display_config.mapSetValue("Value", disp->isEnabled());
disp->load( display_config );
}

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/properties/property.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ void Property::load( const Config& config )
else if( config.getType() == Config::Map )
{
// A special map entry named "Value" means the value of this property, not a child.
// (If child "Value" does not exist, loadValue() will do nothing.)
// (If child "Value"does not exist, loadValue() will do nothing.)
loadValue( config.mapGetChild( "Value" ));

// Loop over all child Properties.
Expand Down

0 comments on commit b78716d

Please sign in to comment.