mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-11-02 20:51:23 -07:00 
			
		
		
		
	Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
This commit is contained in:
		
						commit
						db95460154
					
				
					 4 changed files with 8 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -233,7 +233,6 @@ sub mouse_event {
 | 
			
		|||
    } elsif ($event->LeftUp) {
 | 
			
		||||
        if ($self->{drag_object}) {
 | 
			
		||||
            $self->{on_instances_moved}->();
 | 
			
		||||
            Slic3r::GUI::_3DScene::reset_current_canvas();            
 | 
			
		||||
        }
 | 
			
		||||
        $self->{drag_start_pos} = undef;
 | 
			
		||||
        $self->{drag_object} = undef;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -279,6 +279,7 @@ sub reload_print {
 | 
			
		|||
    my ($self, $force) = @_;
 | 
			
		||||
 | 
			
		||||
    Slic3r::GUI::_3DScene::reset_volumes($self->canvas);
 | 
			
		||||
    Slic3r::GUI::_3DScene::reset_current_canvas();            
 | 
			
		||||
    $self->_loaded(0);
 | 
			
		||||
 | 
			
		||||
    if (! $self->IsShown && ! $force) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue