summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-07-19 17:58:17 +0200
committerGitHub <noreply@github.com>2019-07-19 17:58:17 +0200
commitc317a3ce16a35b21d85b250a0e810526bb89db38 (patch)
treedfe7278154a4901e520c5ddbea575adf1f12a3ae /editor
parente12f3a9bfd15429a2f574bb7cc9e096aa02e7c9c (diff)
parente86f6faf641ea909798ba7fef3414eae6d1400b2 (diff)
Merge pull request #30354 from LikeLakers2/multinodeedit-same-type-properties
MultiNodeEdit now only shows properties with the exact same PropertyInfo data
Diffstat (limited to 'editor')
-rw-r--r--editor/multi_node_edit.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/multi_node_edit.cpp b/editor/multi_node_edit.cpp
index 6af7e4bd00..85e47594a8 100644
--- a/editor/multi_node_edit.cpp
+++ b/editor/multi_node_edit.cpp
@@ -152,7 +152,9 @@ void MultiNodeEdit::_get_property_list(List<PropertyInfo> *p_list) const {
datas.push_back(usage.getptr(F->get().name));
}
- usage[F->get().name].uses++;
+ // Make sure only properties with the same exact PropertyInfo data will appear
+ if (usage[F->get().name].info == F->get())
+ usage[F->get().name].uses++;
}
nc++;