seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64595 from mhilbrunner/ergo-proxy

Browse Source 
Unexpose ProxyTexture
This commit is contained in:
Yuri Sizov
2022-08-19 20:42:27 +03:00
committed by GitHub
parent 7895a66cf2 92bdeb7eb5
commit 96ba6e8cf9
4 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scene/register_scene_types.cpp
View File

@ -845,7 +845,6 @@ void register_scene_types() {
GDREGISTER_CLASS(CurveXYZTexture);
GDREGISTER_CLASS(GradientTexture1D);
GDREGISTER_CLASS(GradientTexture2D);
GDREGISTER_CLASS(ProxyTexture);
GDREGISTER_CLASS(AnimatedTexture);
GDREGISTER_CLASS(CameraTexture);
GDREGISTER_VIRTUAL_CLASS(TextureLayered);

7
scene/resources/texture.cpp
View File

@ -2537,13 +2537,6 @@ void GradientTexture2D::_bind_methods() {
//////////////////////////////////////
void ProxyTexture::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_base", "base"), &ProxyTexture::set_base);
ClassDB::bind_method(D_METHOD("get_base"), &ProxyTexture::get_base);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "base", PROPERTY_HINT_RESOURCE_TYPE, "Texture2D"), "set_base", "get_base");
}
void ProxyTexture::set_base(const Ref<Texture2D> &p_texture) {
ERR_FAIL_COND(p_texture == this);

2
scene/resources/texture.h
View File

@ -883,8 +883,6 @@ VARIANT_ENUM_CAST(GradientTexture2D::Fill);
VARIANT_ENUM_CAST(GradientTexture2D::Repeat);
class ProxyTexture : public Texture2D {
GDCLASS(ProxyTexture, Texture2D);
private:
mutable RID proxy_ph;
mutable RID proxy;