ObjectList: Fixed positioning of the object's part/modifiers when it's added
Use load_modifier() for everything without a respect to the type
This commit is contained in:
parent
b9ac80ccd4
commit
c921d6f936
2 changed files with 11 additions and 7 deletions
src/slic3r/GUI
|
@ -1405,9 +1405,11 @@ void ObjectList::load_subobject(ModelVolumeType type, bool from_galery/* = false
|
||||||
item = m_objects_model->GetItemById(obj_idx);
|
item = m_objects_model->GetItemById(obj_idx);
|
||||||
|
|
||||||
std::vector<ModelVolume*> volumes;
|
std::vector<ModelVolume*> volumes;
|
||||||
|
// ! ysFIXME - delete commented code after testing and rename "load_modifier" to something common
|
||||||
|
/*
|
||||||
if (type == ModelVolumeType::MODEL_PART)
|
if (type == ModelVolumeType::MODEL_PART)
|
||||||
load_part(*(*m_objects)[obj_idx], volumes, type, from_galery);
|
load_part(*(*m_objects)[obj_idx], volumes, type, from_galery);
|
||||||
else
|
else*/
|
||||||
load_modifier(*(*m_objects)[obj_idx], volumes, type, from_galery);
|
load_modifier(*(*m_objects)[obj_idx], volumes, type, from_galery);
|
||||||
|
|
||||||
if (volumes.empty())
|
if (volumes.empty())
|
||||||
|
@ -1430,8 +1432,8 @@ void ObjectList::load_subobject(ModelVolumeType type, bool from_galery/* = false
|
||||||
|
|
||||||
selection_changed();
|
selection_changed();
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
void ObjectList::load_part(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery/* = false*/)
|
void ObjectList::load_part(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery/* = false* /)
|
||||||
{
|
{
|
||||||
if (type != ModelVolumeType::MODEL_PART)
|
if (type != ModelVolumeType::MODEL_PART)
|
||||||
return;
|
return;
|
||||||
|
@ -1489,11 +1491,12 @@ void ObjectList::load_part(ModelObject& model_object, std::vector<ModelVolume*>&
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
void ObjectList::load_modifier(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery)
|
void ObjectList::load_modifier(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery)
|
||||||
{
|
{
|
||||||
if (type == ModelVolumeType::MODEL_PART)
|
// ! ysFIXME - delete commented code after testing and rename "load_modifier" to something common
|
||||||
return;
|
//if (type == ModelVolumeType::MODEL_PART)
|
||||||
|
// return;
|
||||||
|
|
||||||
wxWindow* parent = wxGetApp().tab_panel()->GetPage(0);
|
wxWindow* parent = wxGetApp().tab_panel()->GetPage(0);
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,8 @@ public:
|
||||||
bool is_instance_or_object_selected();
|
bool is_instance_or_object_selected();
|
||||||
|
|
||||||
void load_subobject(ModelVolumeType type, bool from_galery = false);
|
void load_subobject(ModelVolumeType type, bool from_galery = false);
|
||||||
void load_part(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery = false);
|
// ! ysFIXME - delete commented code after testing and rename "load_modifier" to something common
|
||||||
|
//void load_part(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery = false);
|
||||||
void load_modifier(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery = false);
|
void load_modifier(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery = false);
|
||||||
void load_generic_subobject(const std::string& type_name, const ModelVolumeType type);
|
void load_generic_subobject(const std::string& type_name, const ModelVolumeType type);
|
||||||
void load_shape_object(const std::string &type_name);
|
void load_shape_object(const std::string &type_name);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue