Merge master

This commit is contained in:
Filip Sykala 2021-08-02 10:46:47 +02:00
parent 59d02aea0a
commit fc4b18ebb1
2 changed files with 4 additions and 4 deletions

View File

@ -41,8 +41,8 @@ std::string GLGizmoSimplify::on_get_name() const
return (_L("Simplify")).ToUTF8().data(); return (_L("Simplify")).ToUTF8().data();
} }
void GLGizmoSimplify::on_render() const{} void GLGizmoSimplify::on_render() {}
void GLGizmoSimplify::on_render_for_picking() const{} void GLGizmoSimplify::on_render_for_picking() {}
void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limit) void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limit)
{ {

View File

@ -36,8 +36,8 @@ public:
protected: protected:
virtual bool on_init() override; virtual bool on_init() override;
virtual std::string on_get_name() const override; virtual std::string on_get_name() const override;
virtual void on_render() const override; virtual void on_render() override;
virtual void on_render_for_picking() const override; virtual void on_render_for_picking() override;
virtual void on_render_input_window(float x, float y, float bottom_limit) override; virtual void on_render_input_window(float x, float y, float bottom_limit) override;
virtual bool on_is_activable() const override; virtual bool on_is_activable() const override;
virtual bool on_is_selectable() const override { return false; }; virtual bool on_is_selectable() const override { return false; };