File tree Expand file tree Collapse file tree 3 files changed +2
-9
lines changed
include/gz/sim/components Expand file tree Collapse file tree 3 files changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ namespace serializers
46
46
sdf::ElementPtr modelElem = _model.Element ();
47
47
if (!modelElem)
48
48
{
49
- gzerr << " Unable to serialize sdf::Model" << std::endl;
49
+ gzwarn << " Unable to serialize sdf::Model" << std::endl;
50
50
return _out;
51
51
}
52
52
Original file line number Diff line number Diff line change @@ -2620,13 +2620,6 @@ void RenderUtil::SetSceneName(const std::string &_name)
2620
2620
void RenderUtil::SetScene (const rendering::ScenePtr &_scene)
2621
2621
{
2622
2622
this ->dataPtr ->scene = _scene;
2623
- {
2624
- // HACK: Tell ign-rendering6 to listen to SetTime calls
2625
- // TODO(anyone) Remove this when linked against ign-rendering7
2626
- this ->dataPtr ->scene ->SetTime (std::chrono::nanoseconds (-1 ));
2627
- IGN_ASSERT (this ->dataPtr ->scene ->Time () != std::chrono::nanoseconds (-1 ),
2628
- " Please remove this snippet after merging with ign-rendering7" );
2629
- }
2630
2623
this ->dataPtr ->sceneManager .SetScene (_scene);
2631
2624
this ->dataPtr ->engine = _scene == nullptr ? nullptr : _scene->Engine ();
2632
2625
}
Original file line number Diff line number Diff line change @@ -126,7 +126,7 @@ namespace systems
126
126
127
127
// / Documentation inherited
128
128
public: void PostUpdate (const UpdateInfo &_info,
129
- const EntityComponentManager &_ecm);
129
+ const EntityComponentManager &_ecm) override ;
130
130
131
131
// / \brief Private data pointer
132
132
private: std::unique_ptr<ThrusterPrivateData> dataPtr;
You can’t perform that action at this time.
0 commit comments