godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Merge pull request #46877 from W4RH4WK/always-dynamically-allocate-property-table

Browse Source 
Always dynamically allocate PropertyTable
This commit is contained in:
Rémi Verschelde
2021-04-07 11:25:38 +02:00
committed by GitHub
parent f96392a2b5 09bda3f140
commit e261c2dd9d
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/fbx/fbx_parser/FBXDocumentUtil.cpp
View File

@@ -160,7 +160,7 @@ const PropertyTable *GetPropertyTable(const Document &doc,
DOMWarning("property table (Properties70) not found", element); DOMWarning("property table (Properties70) not found", element);
} }
if (templateProps) { if (templateProps) {
return templateProps; return new const PropertyTable(templateProps);
} else { } else {
return new const PropertyTable(); return new const PropertyTable();
} }

5
modules/fbx/fbx_parser/FBXProperties.cpp
View File

@@ -148,6 +148,11 @@ std::string PeekPropertyName(const Element &element) {
PropertyTable::PropertyTable() { PropertyTable::PropertyTable() {
} }
// ------------------------------------------------------------------------------------------------
PropertyTable::PropertyTable(const PropertyTable *templateProps) :
templateProps(templateProps), element() {
}
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
PropertyTable::PropertyTable(const ElementPtr element, const PropertyTable *templateProps) : PropertyTable::PropertyTable(const ElementPtr element, const PropertyTable *templateProps) :
templateProps(templateProps), element(element) { templateProps(templateProps), element(element) {

1
modules/fbx/fbx_parser/FBXProperties.h
View File

@@ -137,6 +137,7 @@ class PropertyTable {
public: public:
// in-memory property table with no source element // in-memory property table with no source element
PropertyTable(); PropertyTable();
PropertyTable(const PropertyTable *templateProps);
PropertyTable(const ElementPtr element, const PropertyTable *templateProps); PropertyTable(const ElementPtr element, const PropertyTable *templateProps);
~PropertyTable(); ~PropertyTable();