mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-07-31 21:41:59 +08:00
be a little smarter about converting things (avoids confusing mingw 7.3)
This commit is contained in:
parent
ce21077c61
commit
cbede041d2
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user