Merge pull request #16063 from bojidar-bg/16051-double-autoplay

Remove duplicate "autoplay" property
godotengine · Jan 25, 2018 · 0181681 · 0181681
2 parents 8afe5b4 + 57bed14
commit 0181681
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
@@ -78,9 +78,6 @@ bool AnimationPlayer::_set(const StringName &p_name, const Variant &p_value) {
 			set_blend_time(from, to, time);
 		}
 
-	} else if (p_name == SceneStringNames::get_singleton()->autoplay) {
-		autoplay = p_value;
-
 	} else
 		return false;
 
@@ -123,9 +120,6 @@ bool AnimationPlayer::_get(const StringName &p_name, Variant &r_ret) const {
 		}
 
 		r_ret = array;
-	} else if (name == "autoplay") {
-		r_ret = autoplay;
-
 	} else
 		return false;
 
@@ -172,7 +166,6 @@ void AnimationPlayer::_get_property_list(List<PropertyInfo> *p_list) const {
 	}
 
 	p_list->push_back(PropertyInfo(Variant::ARRAY, "blend_times", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
-	p_list->push_back(PropertyInfo(Variant::STRING, "autoplay", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR));
 }
 
 void AnimationPlayer::advance(float p_time) {