summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorAndreas Haas <Hinsbart@users.noreply.github.com>2017-12-25 17:47:29 +0000
committerGitHub <noreply@github.com>2017-12-25 17:47:29 +0000
commit37aab45091961e7c063e9c77d6c4835b0c14806a (patch)
tree5f0119fa3a032ad9a6b5b4388293a93440757df9 /scene
parentbcf684f9d7a9e983bf4bc93ef037f05905d74b23 (diff)
parentf9c2cfbe319f9c0647dcaf5c2b0ef98187b36480 (diff)
Merge pull request #15040 from Noshyaar/pr2
AnimTreePlayer: fix duplicated properties
Diffstat (limited to 'scene')
-rw-r--r--scene/animation/animation_tree_player.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 32f82fe6b8..fceca55c3e 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -386,8 +386,6 @@ bool AnimationTreePlayer::_get(const StringName &p_name, Variant &r_ret) const {
void AnimationTreePlayer::_get_property_list(List<PropertyInfo> *p_list) const {
- p_list->push_back(PropertyInfo(Variant::NODE_PATH, "base_path"));
- p_list->push_back(PropertyInfo(Variant::NODE_PATH, "master_player"));
p_list->push_back(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_NETWORK));
}