diff --git a/core/variant_call.cpp b/core/variant_call.cpp index a5927bb6f8e..7da4cef1158 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -1667,10 +1667,10 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_pressed,varray()); ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action,STRING,"action",varray()); - ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"is_action_pressed",varray()); - ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"is_action_released",varray()); + ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"action",varray()); + ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"action",varray()); ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_echo,varray()); - ADDFUNC2(INPUT_EVENT,NIL,InputEvent,set_as_action,STRING,"action",BOOL,"pressed",varray()); + ADDFUNC2(INPUT_EVENT,NIL,InputEvent,set_as_action,STRING,"action",BOOL,"pressed",varray()); /* REGISTER CONSTRUCTORS */ @@ -1689,7 +1689,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl _VariantCall::add_constructor(_VariantCall::Plane_init3,Variant::PLANE,"normal",Variant::VECTOR3,"d",Variant::REAL); _VariantCall::add_constructor(_VariantCall::Quat_init1,Variant::QUAT,"x",Variant::REAL,"y",Variant::REAL,"z",Variant::REAL,"w",Variant::REAL); - _VariantCall::add_constructor(_VariantCall::Quat_init2,Variant::QUAT,"axis",Variant::VECTOR3,"angle",Variant::REAL); + _VariantCall::add_constructor(_VariantCall::Quat_init2,Variant::QUAT,"axis",Variant::VECTOR3,"angle",Variant::REAL); _VariantCall::add_constructor(_VariantCall::Color_init1,Variant::COLOR,"r",Variant::REAL,"g",Variant::REAL,"b",Variant::REAL,"a",Variant::REAL); _VariantCall::add_constructor(_VariantCall::Color_init2,Variant::COLOR,"r",Variant::REAL,"g",Variant::REAL,"b",Variant::REAL); diff --git a/doc/base/classes.xml b/doc/base/classes.xml index ce92d1e498d..c77a3c7a45c 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -12874,8 +12874,6 @@ Maximum amount of parameters. - - Read texture coordinates from the UV array. @@ -12885,6 +12883,8 @@ Read texture coordinates from the UV2 array. + + @@ -15974,7 +15974,7 @@ - + @@ -15982,7 +15982,7 @@ - + @@ -16062,7 +16062,7 @@ - + @@ -16070,7 +16070,7 @@ - + @@ -16142,7 +16142,7 @@ - + @@ -16150,7 +16150,7 @@ - + @@ -16228,7 +16228,7 @@ - + @@ -16236,7 +16236,7 @@ - + @@ -16312,7 +16312,7 @@ - + @@ -16320,7 +16320,7 @@ - + @@ -16408,7 +16408,7 @@ - + @@ -16416,7 +16416,7 @@ - + @@ -16516,7 +16516,7 @@ - + @@ -16524,7 +16524,7 @@ - + @@ -16630,7 +16630,7 @@ - + @@ -16638,7 +16638,7 @@ - + @@ -16730,7 +16730,7 @@ - + @@ -16738,7 +16738,7 @@ - + diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index e56314c1f87..f6213f74e81 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -406,10 +406,10 @@ void FixedMaterial::_bind_methods() { BIND_CONSTANT( PARAM_SHADE_PARAM ); BIND_CONSTANT( PARAM_MAX ); - BIND_CONSTANT( TEXCOORD_SPHERE ); BIND_CONSTANT( TEXCOORD_UV ); BIND_CONSTANT( TEXCOORD_UV_TRANSFORM ); BIND_CONSTANT( TEXCOORD_UV2 ); + BIND_CONSTANT( TEXCOORD_SPHERE ); BIND_CONSTANT( FLAG_USE_ALPHA ); BIND_CONSTANT( FLAG_USE_COLOR_ARRAY );