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 time_estimate
This commit is contained in:
		
						commit
						f9e6bcf872
					
				
					 8 changed files with 30 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -206,6 +206,8 @@ sub new {
 | 
			
		|||
            Slic3r::GUI::_3DScene::set_active($self->{canvas3D}, 0);
 | 
			
		||||
            Slic3r::GUI::_3DScene::enable_legend_texture($self->{preview3D}->canvas, 1);
 | 
			
		||||
            $self->{preview3D}->load_print(1);
 | 
			
		||||
            # sets the canvas as dirty to force a render at the 1st idle event (wxWidgets IsShownOnScreen() is buggy and cannot be used reliably)
 | 
			
		||||
            Slic3r::GUI::_3DScene::set_as_dirty($self->{preview3D}->canvas);
 | 
			
		||||
        } else {
 | 
			
		||||
            Slic3r::GUI::_3DScene::enable_legend_texture($self->{preview3D}->canvas, 0);
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			@ -218,6 +220,8 @@ sub new {
 | 
			
		|||
                Slic3r::GUI::_3DScene::set_objects_selections($self->{canvas3D}, \@$selections);
 | 
			
		||||
                Slic3r::GUI::_3DScene::reload_scene($self->{canvas3D}, 1);
 | 
			
		||||
            }            
 | 
			
		||||
            # sets the canvas as dirty to force a render at the 1st idle event (wxWidgets IsShownOnScreen() is buggy and cannot be used reliably)
 | 
			
		||||
            Slic3r::GUI::_3DScene::set_as_dirty($self->{canvas3D});
 | 
			
		||||
        } else {
 | 
			
		||||
            $preview->OnActivate if $preview->can('OnActivate');        
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue