summaryrefslogtreecommitdiffstats
path: root/scene/resources/texture.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-14 11:07:57 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-14 11:10:42 -0300
commitdcb95ec1473eff3f455909cd81c3cd50b1e1159b (patch)
tree60343275911d48ebf993041dec92e1eac112b746 /scene/resources/texture.cpp
parent93ab45b6b5c4f8e0619e963156c983009d399a9d (diff)
downloadredot-engine-dcb95ec1473eff3f455909cd81c3cd50b1e1159b.tar.gz
removed duplicated functions in class hierarchy that were bound more than once
added a check to detect this case in the future
Diffstat (limited to 'scene/resources/texture.cpp')
-rw-r--r--scene/resources/texture.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index 462341a751..a1ad5d8237 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -66,7 +66,6 @@ void Texture::_bind_methods() {
ClassDB::bind_method(_MD("get_width"),&Texture::get_width);
ClassDB::bind_method(_MD("get_height"),&Texture::get_height);
ClassDB::bind_method(_MD("get_size"),&Texture::get_size);
- ClassDB::bind_method(_MD("get_rid"),&Texture::get_rid);
ClassDB::bind_method(_MD("has_alpha"),&Texture::has_alpha);
ClassDB::bind_method(_MD("set_flags","flags"),&Texture::set_flags);
ClassDB::bind_method(_MD("get_flags"),&Texture::get_flags);
@@ -1050,7 +1049,7 @@ void CubeMap::_bind_methods() {
ClassDB::bind_method(_MD("get_width"),&CubeMap::get_width);
ClassDB::bind_method(_MD("get_height"),&CubeMap::get_height);
- ClassDB::bind_method(_MD("get_rid"),&CubeMap::get_rid);
+ //ClassDB::bind_method(_MD("get_rid"),&CubeMap::get_rid);
ClassDB::bind_method(_MD("set_flags","flags"),&CubeMap::set_flags);
ClassDB::bind_method(_MD("get_flags"),&CubeMap::get_flags);