birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyOArchive.cpp
+2 -9
View File
@@ -227,7 +227,6 @@ PropertyRow* PropertyOArchive::updateRowPrimitive(const char* name, const char*
bool PropertyOArchive::operator()(const Serialization::SStruct& ser, const char* name, const char* label)
{
const char* typeName = ser.type().name();
size_t size = ser.size();
lastNode_ = currentNode_;
bool hideChildren = outlineMode_ && currentNode_ && currentNode_->isContainer();
@@ -352,8 +351,6 @@ bool PropertyOArchive::operator()(double& value, const char* name, const char* l
bool PropertyOArchive::operator()(Serialization::IContainer& ser, const char *name, const char *label)
{
const char* elementTypeName = ser.elementType().name();
bool fixedSizeContainer = ser.isFixedSize();
lastNode_ = currentNode_;
enterNode(updateRow<PropertyRowContainer>(name, label, ser.containerType().name(), ser));
if (!model_->defaultTypeRegistered(elementTypeName)) {
@@ -442,13 +439,9 @@ bool PropertyOArchive::operator()(Serialization::ICallback& callback, const char
bool PropertyOArchive::operator()(Serialization::Object& obj, const char *name, const char *label)
{
const char* typeName = obj.type().name();
PropertyRowObject* row = 0;
if (typeName_.empty())
row = updateRow<PropertyRowObject>(name, label, obj.type().name(), obj);
else
row = updateRow<PropertyRowObject>(name, label, obj.type().name(), obj);
row = updateRow<PropertyRowObject>(name, label, obj.type().name(), obj);
lastNode_ = row;
return true;
}