classref: Fix arg name for is_action_pressed/released

Also position TEXTURE_SPHERE constant properly.

(cherry picked from commit a15de809429171e93556db6e9d7010a2b3d61f18)

3 files changed, 25 insertions, 25 deletions

diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 483d2573e..0928bb18b 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -1587,10 +1587,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 */
 
@@ -1609,7 +1609,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 d77908366..36dffb576 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -11701,8 +11701,6 @@ This approximation makes straight segments between each point, then subdivides t
 		<constant name="PARAM_MAX" value="8">
 			Maximum amount of parameters.
 		</constant>
-		<constant name="TEXCOORD_SPHERE" value="3">
-		</constant>
 		<constant name="TEXCOORD_UV" value="0">
 			Read texture coordinates from the UV array.
 		</constant>
@@ -11712,6 +11710,8 @@ This approximation makes straight segments between each point, then subdivides t
 		<constant name="TEXCOORD_UV2" value="2">
 			Read texture coordinates from the UV2 array.
 		</constant>
+		<constant name="TEXCOORD_SPHERE" value="3">
+		</constant>
 		<constant name="FLAG_USE_ALPHA" value="0">
 		</constant>
 		<constant name="FLAG_USE_COLOR_ARRAY" value="1">
@@ -14666,7 +14666,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -14674,7 +14674,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -14754,7 +14754,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -14762,7 +14762,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -14834,7 +14834,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -14842,7 +14842,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -14920,7 +14920,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -14928,7 +14928,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15004,7 +15004,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15012,7 +15012,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15100,7 +15100,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15108,7 +15108,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15208,7 +15208,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15216,7 +15216,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15322,7 +15322,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15330,7 +15330,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15422,7 +15422,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
@@ -15430,7 +15430,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index e56314c1f..f6213f74e 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 );