asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #64560 from olibombardier/has-filter-virtual

Browse source 
Fix has_filter of AnimationNode not being called in scripts
This commit is contained in:
Yuri Sizov 2022-08-22 16:07:46 +03:00 committed by GitHub
commit cdced052f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/AnimationNode.xml
View file

@ -107,7 +107,7 @@
</description> </description>
</method> </method>
<method name="has_filter" qualifiers="virtual"> <method name="has_filter" qualifiers="virtual">
<return type="String" /> <return type="bool" />
<description> <description>
When inheriting from [AnimationRootNode], implement this virtual method to return whether the blend tree editor should display filter editing on this node. When inheriting from [AnimationRootNode], implement this virtual method to return whether the blend tree editor should display filter editing on this node.
</description> </description>

5
scene/animation/animation_tree.cpp
View file

@ -357,6 +357,9 @@ bool AnimationNode::is_path_filtered(const NodePath &p_path) const {
} }
bool AnimationNode::has_filter() const { bool AnimationNode::has_filter() const {
if (get_script_instance()) {
return get_script_instance()->call("has_filter");
}
return false; return false;
} }
@ -427,7 +430,7 @@ void AnimationNode::_bind_methods() {
} }
BIND_VMETHOD(MethodInfo("process", PropertyInfo(Variant::REAL, "time"), PropertyInfo(Variant::BOOL, "seek"))); BIND_VMETHOD(MethodInfo("process", PropertyInfo(Variant::REAL, "time"), PropertyInfo(Variant::BOOL, "seek")));
BIND_VMETHOD(MethodInfo(Variant::STRING, "get_caption")); BIND_VMETHOD(MethodInfo(Variant::STRING, "get_caption"));
BIND_VMETHOD(MethodInfo(Variant::STRING, "has_filter")); BIND_VMETHOD(MethodInfo(Variant::BOOL, "has_filter"));
ADD_SIGNAL(MethodInfo("removed_from_graph")); ADD_SIGNAL(MethodInfo("removed_from_graph"));