diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-01-11 16:44:18 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 16:44:18 -0300 |
| commit | 9a6282975938106d17ccd49ef1b8c7fc4b11b3d2 (patch) | |
| tree | 99ea03bf071b792ceb4d65a511173b3190f1dba9 /scene/animation | |
| parent | b63384a9f1d318d22f67519de8c93144d45251bb (diff) | |
| parent | 09a6a74074332b964316683fdfca90094f40a2f5 (diff) | |
Merge pull request #15531 from AndreaCatania/p2
Fixed crash on duplicate GIProbe baking
Diffstat (limited to 'scene/animation')
| -rw-r--r-- | scene/animation/animation_player.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index f56e8fa9e3..7d909d0cb3 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -158,7 +158,7 @@ void AnimationPlayer::_get_property_list(List<PropertyInfo> *p_list) const { for (Map<StringName, AnimationData>::Element *E = animation_set.front(); E; E = E->next()) { - anim_names.push_back(PropertyInfo(Variant::OBJECT, "anims/" + String(E->key()), PROPERTY_HINT_RESOURCE_TYPE, "Animation", PROPERTY_USAGE_NOEDITOR)); + anim_names.push_back(PropertyInfo(Variant::OBJECT, "anims/" + String(E->key()), PROPERTY_HINT_RESOURCE_TYPE, "Animation", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE)); if (E->get().next != StringName()) anim_names.push_back(PropertyInfo(Variant::STRING, "next/" + String(E->key()), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR)); names.push_back(E->key()); |