Fix XFile name for $ and {}

Memleak copy constructor
pull/493/head
Madrich 2015-03-14 20:52:53 +01:00
parent edd3ed9e8f
commit c4eb04bb8c
2 changed files with 7 additions and 6 deletions

View File

@ -495,13 +495,11 @@ void Exporter :: UnregisterExporter(const char* id)
ExportProperties :: ExportProperties() {} ExportProperties :: ExportProperties() {}
ExportProperties::ExportProperties(const ExportProperties &other) ExportProperties::ExportProperties(const ExportProperties &other)
: mIntProperties(other.mIntProperties),
mFloatProperties(other.mFloatProperties),
mStringProperties(other.mStringProperties),
mMatrixProperties(other.mMatrixProperties)
{ {
new(this) ExportProperties();
mIntProperties = other.mIntProperties;
mFloatProperties = other.mFloatProperties;
mStringProperties = other.mStringProperties;
mMatrixProperties = other.mMatrixProperties;
} }

View File

@ -510,6 +510,9 @@ std::string XFileExporter::toXFileString(aiString &name)
std::string str = std::string(name.C_Str()); std::string str = std::string(name.C_Str());
std::replace(str.begin(), str.end(), '<', '_'); std::replace(str.begin(), str.end(), '<', '_');
std::replace(str.begin(), str.end(), '>', '_'); std::replace(str.begin(), str.end(), '>', '_');
std::replace(str.begin(), str.end(), '{', '_');
std::replace(str.begin(), str.end(), '}', '_');
std::replace(str.begin(), str.end(), '$', '_');
return str; return str;
} }