From b78716d295d84e5ea3c396676ae399614807da68 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Sun, 1 Sep 2019 15:37:45 +0200 Subject: [PATCH] Revert "Display::load: avoid premature enabling" Some displays, e.g. RobotModelDisplay, rely on the fact that the display is enabled before loading of its parameters. This reverts commit 0969fef6b04cbc53d99f1b4d6c7483c9961368f3. --- src/rviz/display_group.cpp | 2 -- src/rviz/properties/property.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/rviz/display_group.cpp b/src/rviz/display_group.cpp index 787ffed147..0c461815bd 100644 --- a/src/rviz/display_group.cpp +++ b/src/rviz/display_group.cpp @@ -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 ); } diff --git a/src/rviz/properties/property.cpp b/src/rviz/properties/property.cpp index ab05d55659..428b83d5c8 100644 --- a/src/rviz/properties/property.cpp +++ b/src/rviz/properties/property.cpp @@ -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.