diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 20:32:52 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 20:32:52 +0100 |
| commit | 86b0669f4c1d10ddf393b3f627c1da7078fb4863 (patch) | |
| tree | 44c56b94e03a7ffda00c23d7372a1a03d6aec4fa | |
| parent | dcc4ee21c14c1d3fc40c2058e41f853e8ce989c6 (diff) | |
Revert "Add/expose VisualServer::get_default_clear_color()"
This reverts commit 753ba67d653c65239f0549313f3cca3330fd27f9,
in preparation from the merge of the gles3 branch, as the VisualServer
code changed too much to port this commit over during merge conflicts
resolution. It could be readded afterwards.
| -rw-r--r-- | servers/visual/visual_server_raster.cpp | 5 | ||||
| -rw-r--r-- | servers/visual/visual_server_raster.h | 1 | ||||
| -rw-r--r-- | servers/visual/visual_server_wrap_mt.h | 1 | ||||
| -rw-r--r-- | servers/visual_server.cpp | 1 | ||||
| -rw-r--r-- | servers/visual_server.h | 1 |
5 files changed, 0 insertions, 9 deletions
diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index d5d03c695c..757b1605d5 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -7612,11 +7612,6 @@ void VisualServerRaster::set_default_clear_color(const Color& p_color) { clear_color=p_color; } -Color VisualServerRaster::get_default_clear_color() const { - - return clear_color; -} - void VisualServerRaster::set_boot_image(const Image& p_image, const Color& p_color,bool p_scale) { if (p_image.empty()) diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 8c1a04a09b..71e91b8dfb 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -1286,7 +1286,6 @@ public: virtual void set_boot_image(const Image& p_image, const Color& p_color, bool p_scale); virtual void set_default_clear_color(const Color& p_color); - virtual Color get_default_clear_color() const; VisualServerRaster(Rasterizer *p_rasterizer); ~VisualServerRaster(); diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index f8b3b33919..56b63f3429 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -718,7 +718,6 @@ public: FUNC3(set_boot_image,const Image& , const Color&,bool ); FUNC1(set_default_clear_color,const Color& ); - FUNC0RC(Color,get_default_clear_color ); FUNC0R(RID,get_test_cube ); diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 8164b0ecf6..b149ab9d8a 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -564,7 +564,6 @@ void VisualServer::_bind_methods() { ObjectTypeDB::bind_method(_MD("free_rid"),&VisualServer::free); ObjectTypeDB::bind_method(_MD("set_default_clear_color"),&VisualServer::set_default_clear_color); - ObjectTypeDB::bind_method(_MD("get_default_clear_color"),&VisualServer::get_default_clear_color); ObjectTypeDB::bind_method(_MD("get_render_info"),&VisualServer::get_render_info); diff --git a/servers/visual_server.h b/servers/visual_server.h index 0632f6bce0..4b91989507 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -1181,7 +1181,6 @@ public: virtual void set_boot_image(const Image& p_image, const Color& p_color,bool p_scale)=0; virtual void set_default_clear_color(const Color& p_color)=0; - virtual Color get_default_clear_color() const=0; enum Features { FEATURE_SHADERS, |