be a little smarter about converting things (avoids confusing mingw 7.3)

This commit is contained in:
Joseph Lenox 2018-05-10 19:10:33 -05:00
parent ce21077c61
commit cbede041d2

View File

@ -280,7 +280,7 @@ std::vector<int> Plater::load_model_objects(ModelObjectPtrs model_objects) {
auto tmpobj {PlaterObject()};
const auto objfile {wxFileName::FileName( obj->input_file )};
tmpobj.name = wxString(std::string() == obj->name ? obj->name : objfile.GetName());
tmpobj.name = (std::string() == obj->name ? wxString(obj->name) : objfile.GetName());
tmpobj.identifier = (this->object_identifier)++;
this->objects.push_back(tmpobj);