diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-06-03 13:54:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-03 13:54:53 +0200 |
commit | d1999048e9b300bb2f32a28ca9f88600c6c598cc (patch) | |
tree | e09f8304e430bb9dc47a3e1b6e3d66a44ae35b30 /editor | |
parent | 1abca6269780d08409c5907cb2b2ba54a674514d (diff) | |
parent | e1e3fcc908b622b7ee63cc31ddfc2d385e9e8fd8 (diff) |
Merge pull request #29428 from akien-mga/docdata-merge-properties
doc: Fix DocData.merge_from copying old setters and getters
Diffstat (limited to 'editor')
-rw-r--r-- | editor/doc/doc_data.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index c2a492bc9a..7d2159d365 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -136,9 +136,6 @@ void DocData::merge_from(const DocData &p_data) { const PropertyDoc &pf = cf.properties[j]; p.description = pf.description; - p.setter = pf.setter; - p.getter = pf.getter; - break; } } |