mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-11-02 12:41:18 -07:00 
			
		
		
		
	Merge branch 'master' of https://github.com/prusa3d/Slic3r
This commit is contained in:
		
						commit
						9d2edf31ee
					
				
					 1 changed files with 13 additions and 5 deletions
				
			
		| 
						 | 
					@ -820,11 +820,19 @@ void GLGizmoSlaSupports::unselect_point(int i)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void GLGizmoSlaSupports::editing_mode_discard_changes()
 | 
					void GLGizmoSlaSupports::editing_mode_discard_changes()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    m_editing_mode_cache.clear();
 | 
					    // If the points were autogenerated, they may not be on the ModelObject yet.
 | 
				
			||||||
    for (const sla::SupportPoint& point : m_model_object->sla_support_points)
 | 
					    // Because the user probably messed with the cache, we will get the data
 | 
				
			||||||
        m_editing_mode_cache.emplace_back(point, false);
 | 
					    // from the backend again.
 | 
				
			||||||
    m_editing_mode = false;
 | 
					
 | 
				
			||||||
    m_unsaved_changes = false;
 | 
					    if (m_model_object->sla_points_status == sla::PointsStatus::AutoGenerated)
 | 
				
			||||||
 | 
					        get_data_from_backend();
 | 
				
			||||||
 | 
					    else {
 | 
				
			||||||
 | 
					        m_editing_mode_cache.clear();
 | 
				
			||||||
 | 
					        for (const sla::SupportPoint& point : m_model_object->sla_support_points)
 | 
				
			||||||
 | 
					            m_editing_mode_cache.emplace_back(point, false);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					        m_editing_mode = false;
 | 
				
			||||||
 | 
					        m_unsaved_changes = false;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue