From f30745bd85ea1a139ff0873d9e96f13d7b90db69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 26 Nov 2018 11:21:06 +0100 Subject: [PATCH] Fixup to typo and indentation in 81c86e8 --- doc/classes/AnimationNode.xml | 52 +++++++++++++++--------------- scene/animation/animation_tree.cpp | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/classes/AnimationNode.xml b/doc/classes/AnimationNode.xml index 7b9d523acf..0f16c5e4a9 100644 --- a/doc/classes/AnimationNode.xml +++ b/doc/classes/AnimationNode.xml @@ -1,10 +1,10 @@ - Base resource for [AnimationTree] nodes. + Base resource for [AnimationTree] nodes. - Base resource for [AnimationTree] nodes. In general it's not used directly but you can create custom ones with custom blending formulas. + Base resource for [AnimationTree] nodes. In general it's not used directly but you can create custom ones with custom blending formulas. Inherit this when creating nodes mainly for use in [AnimationNodeBlendTree], otherwise [AnimationRootNode] should be used instead. @@ -18,7 +18,7 @@ - Add an input to the node. This is only useful for nodes created for use in an [AnimationNodeBlendTree] + Add an input to the node. This is only useful for nodes created for use in an [AnimationNodeBlendTree] @@ -35,7 +35,7 @@ - Blend an animation by "blend" amount (name must be valid in the linked [AnimationPlayer]). A time and delta mas be passed, as well as whether seek happened. + Blend an animation by "blend" amount (name must be valid in the linked [AnimationPlayer]). A time and delta mas be passed, as well as whether seek happened. @@ -54,7 +54,7 @@ - Blend an input. This is only useful for nodes created for an AnimationBlendTree. Time is a delta, unless "seek" is true, in which case it is absolute. A filter mode may be optionally passed. + Blend an input. This is only useful for nodes created for an AnimationBlendTree. Time is a delta, unless "seek" is true, in which case it is absolute. A filter mode may be optionally passed. @@ -75,14 +75,14 @@ - Blend another animaiton node (in case this node contains children animation nodes). This function is only useful if you inherit from [AnimationRootNode] instead, else editors will not display your node for addition. + Blend another animaiton node (in case this node contains children animation nodes). This function is only useful if you inherit from [AnimationRootNode] instead, else editors will not display your node for addition. - Get the text caption for this node (used by some editors) + Get the text caption for this node (used by some editors) @@ -91,21 +91,21 @@ - Get the a child node by index (used by editors inheriting from [AnimationRootNode]). + Get the a child node by index (used by editors inheriting from [AnimationRootNode]). - Get all children nodes, in order as a name:node dictionary. Only useful when inheriting [AnimationRootNode]. + Get all children nodes, in order as a name:node dictionary. Only useful when inheriting [AnimationRootNode]. - Amount of inputs in this node, only useful for nodes that go into [AnimationBlendTree]. + Amount of inputs in this node, only useful for nodes that go into [AnimationBlendTree]. @@ -114,7 +114,7 @@ - Get the name of an input by index. + Get the name of an input by index. @@ -123,7 +123,7 @@ - Get the value of a parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees. + Get the value of a parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees. @@ -132,14 +132,14 @@ - Get the default value of a parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees. + Get the default value of a parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees. - Get the property information for parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees. + Get the property information for parameter. Parameters are custom local memory used for your nodes, given a resource can be reused in multiple trees. Format is similar to [Object.get_property_list] @@ -147,7 +147,7 @@ - Return true whether you want the blend tree editor to display filter editing on this node. + Return true whether you want the blend tree editor to display filter editing on this node. @@ -156,7 +156,7 @@ - Return true wether a given path is filtered. + Return true wether a given path is filtered. @@ -167,7 +167,7 @@ - Called when a custom node is processed. The argument "time" is relative, unless "seek" is true (in which case it is absolute). + Called when a custom node is processed. The argument "time" is relative, unless "seek" is true (in which case it is absolute). Here, call the [method blend_input], [method blend_node] or [method blend_animation] functions. You can also use [method get_parameter] and [method set_parameter] to modify local memory. This function returns the time left for the current animation to finish (if unsure, just pass the value from the main blend being called). @@ -179,7 +179,7 @@ - Remove an input, call this only when inactive. + Remove an input, call this only when inactive. @@ -190,7 +190,7 @@ - Add/Remove a path for the filter. + Add/Remove a path for the filter. @@ -201,19 +201,19 @@ - Set a custom parameter. These are used as local storage, because resources can be reused across the tree or scenes. + Set a custom parameter. These are used as local storage, because resources can be reused across the tree or scenes. - Return whether filtering is enabled. + Return whether filtering is enabled. - Called when the node was removed from the graph. + Called when the node was removed from the graph. @@ -223,16 +223,16 @@ - Do not use filtering. + Do not use filtering. - Paths matching the filter will be allowed to pass. + Paths matching the filter will be allowed to pass. - Paths matching the filter will be discarded. + Paths matching the filter will be discarded. - Paths matching the filter will be blended (by the blend value). + Paths matching the filter will be blended (by the blend value). diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index 03c3c78768..2c8cbbdbd1 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -397,7 +397,7 @@ void AnimationNode::_validate_property(PropertyInfo &property) const { Ref AnimationNode::get_child_by_name(const StringName &p_name) { if (get_script_instance()) { - return get_script_instance()->call("get_child_by_nane"); + return get_script_instance()->call("get_child_by_name"); } return Ref(); }