FIX:Thumbnail render should use light in "obj import" dialog
jira: none Change-Id: I1457876a12f42abd93d26cebb60d2d7d8075df74
This commit is contained in:
parent
310f13f36a
commit
7768570492
|
@ -3772,7 +3772,9 @@ bool Model::obj_import_face_color_deal(const std::vector<unsigned char> &face_fi
|
||||||
for (size_t i = 0; i < volume->mesh().its.indices.size(); i++) {
|
for (size_t i = 0; i < volume->mesh().its.indices.size(); i++) {
|
||||||
auto face = volume->mesh().its.indices[i];
|
auto face = volume->mesh().its.indices[i];
|
||||||
auto filament_id = face_filament_ids[i];
|
auto filament_id = face_filament_ids[i];
|
||||||
if (filament_id <= 1) { continue; }
|
if (filament_id < 1) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
std::string result;
|
std::string result;
|
||||||
get_real_filament_id(filament_id, result);
|
get_real_filament_id(filament_id, result);
|
||||||
volume->mmu_segmentation_facets.set_triangle_from_string(i, result);
|
volume->mmu_segmentation_facets.set_triangle_from_string(i, result);
|
||||||
|
|
|
@ -515,7 +515,11 @@ void ObjColorPanel::update_filament_ids()
|
||||||
m_filament_ids.reserve(m_input_colors_size);
|
m_filament_ids.reserve(m_input_colors_size);
|
||||||
for (size_t i = 0; i < m_input_colors_size; i++) {
|
for (size_t i = 0; i < m_input_colors_size; i++) {
|
||||||
auto label = m_cluster_labels_from_algo[i];
|
auto label = m_cluster_labels_from_algo[i];
|
||||||
|
if (m_cluster_map_filaments[label] > 0) {
|
||||||
m_filament_ids.emplace_back(m_cluster_map_filaments[label]);
|
m_filament_ids.emplace_back(m_cluster_map_filaments[label]);
|
||||||
|
} else {
|
||||||
|
m_filament_ids.emplace_back(1);//min filament_id is 1
|
||||||
|
}
|
||||||
}
|
}
|
||||||
m_first_extruder_id = m_cluster_map_filaments[0];
|
m_first_extruder_id = m_cluster_map_filaments[0];
|
||||||
}
|
}
|
||||||
|
|
|
@ -12107,7 +12107,7 @@ void Plater::update_obj_preview_thumbnail(ModelObject *mo, int obj_idx, int vol_
|
||||||
ModelObjectPtrs model_objects;
|
ModelObjectPtrs model_objects;
|
||||||
model_objects.emplace_back(mo);
|
model_objects.emplace_back(mo);
|
||||||
get_view3D_canvas3D()->render_thumbnail(plate->obj_preview_thumbnail_data, colors, plate->plate_thumbnail_width, plate->plate_thumbnail_height, thumbnail_params,
|
get_view3D_canvas3D()->render_thumbnail(plate->obj_preview_thumbnail_data, colors, plate->plate_thumbnail_width, plate->plate_thumbnail_height, thumbnail_params,
|
||||||
model_objects, cur_volumes, Camera::EType::Ortho, (Camera::ViewAngleType) camera_view_angle_type, false, true);
|
model_objects, cur_volumes, Camera::EType::Ortho, (Camera::ViewAngleType) camera_view_angle_type, false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//invalid all plate's thumbnails
|
//invalid all plate's thumbnails
|
||||||
|
|
Loading…
Reference in New Issue