summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-11-20 00:13:10 +0100
committerGitHub <noreply@github.com>2017-11-20 00:13:10 +0100
commit171c46120d7fc3ff73500711824995cd24a64a51 (patch)
tree6c7137d9af8ca6482f0a6d4f9d94bd2bb9fc4681
parent9143df15976c26e931d66fd89d3158ccb5934535 (diff)
parent22bdad8bbe2306d5b3ccaeb25483b39fc760de53 (diff)
Merge pull request #13042 from gad-o/customIconFix
Fix #10798: Fixes Change Type does not change icon
-rw-r--r--editor/scene_tree_dock.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 816156ef00..21ac27dc4e 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -1459,6 +1459,8 @@ void SceneTreeDock::_create() {
for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
continue;
+ if (E->get().name == "__meta__")
+ continue;
newnode->set(E->get().name, n->get(E->get().name));
}