diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-10-29 19:26:00 -0500 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-10-29 19:26:00 -0500 |
| commit | 598cfbdfd602b2440c9d516d67c62f8a75dd6df0 (patch) | |
| tree | 860563ab177ea8a29e0e0079e3b00cf4d8707abc | |
| parent | 696ca9db3c1aa45a57824783426d595f2d8c03d6 (diff) | |
| parent | ec62978dd0cf34e96576627393396782fad7e69b (diff) | |
| download | redot-engine-598cfbdfd602b2440c9d516d67c62f8a75dd6df0.tar.gz | |
Merge pull request #97020 from GuilhermeGSousa/fix-non-const-anim-node-process
Fix non const animation node `_process` virtual function
| -rw-r--r-- | doc/classes/AnimationNode.xml | 2 | ||||
| -rw-r--r-- | misc/extension_api_validation/4.3-stable.expected | 7 | ||||
| -rw-r--r-- | scene/animation/animation_tree.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/doc/classes/AnimationNode.xml b/doc/classes/AnimationNode.xml index 4e093cb887..3b7cd9adad 100644 --- a/doc/classes/AnimationNode.xml +++ b/doc/classes/AnimationNode.xml @@ -63,7 +63,7 @@ When inheriting from [AnimationRootNode], implement this virtual method to return whether the [param parameter] is read-only. Parameters are custom local memory used for your animation nodes, given a resource can be reused in multiple trees. </description> </method> - <method name="_process" qualifiers="virtual const" deprecated="Currently this is mostly useless as there is a lack of many APIs to extend AnimationNode by GDScript. It is planned that a more flexible API using structures will be provided in the future."> + <method name="_process" qualifiers="virtual" deprecated="Currently this is mostly useless as there is a lack of many APIs to extend AnimationNode by GDScript. It is planned that a more flexible API using structures will be provided in the future."> <return type="float" /> <param index="0" name="time" type="float" /> <param index="1" name="seek" type="bool" /> diff --git a/misc/extension_api_validation/4.3-stable.expected b/misc/extension_api_validation/4.3-stable.expected index 960edd0575..9e169d474d 100644 --- a/misc/extension_api_validation/4.3-stable.expected +++ b/misc/extension_api_validation/4.3-stable.expected @@ -95,3 +95,10 @@ Validate extension JSON: Error: Field 'classes/InputMap/methods/add_action/argum Default deadzone value was changed. No adjustments should be necessary. Compatibility method registered. + + +GH-97020 +-------- +Validate extension JSON: Error: Field 'classes/AnimationNode/methods/_process': is_const changed value in new API, from true to false. + +`_process` virtual method fixed to be non const instead. diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h index 8ee80f29ee..eb25a8db1b 100644 --- a/scene/animation/animation_tree.h +++ b/scene/animation/animation_tree.h @@ -186,7 +186,7 @@ protected: GDVIRTUAL1RC(Ref<AnimationNode>, _get_child_by_name, StringName) GDVIRTUAL1RC(Variant, _get_parameter_default_value, StringName) GDVIRTUAL1RC(bool, _is_parameter_read_only, StringName) - GDVIRTUAL4RC(double, _process, double, bool, bool, bool) + GDVIRTUAL4R(double, _process, double, bool, bool, bool) GDVIRTUAL0RC(String, _get_caption) GDVIRTUAL0RC(bool, _has_filter) |