3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed UI bug on OSX, experimental features made switchable through

Browse source 
environment.
This commit is contained in:
bubnikv 2016-12-14 15:36:18 +01:00
parent 79ff013ea7
commit c79e1cc89b
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/Slic3r/GUI/3DScene.pm
View file

@ -191,6 +191,12 @@ sub new {
return $self;
}
sub Destroy {
my ($self) = @_;
$self->DestroyGL;
return $self->SUPER::Destroy;
}
sub _first_selected_object_id {
my ($self) = @_;
for my $i (0..$#{$self->volumes}) {
@ -786,7 +792,8 @@ sub InitGL {
$self->init(1);
my $shader;
$shader = $self->{shader} = new Slic3r::GUI::GLShader;
$shader = $self->{shader} = new Slic3r::GUI::GLShader
if (defined($ENV{'SLIC3R_EXPERIMENTAL'} && defined($ENV{'SLIC3R_EXPERIMENTAL'} == 1);
if ($self->{shader}) {
my $info = $shader->Load($self->_fragment_shader, $self->_vertex_shader);
print $info if $info;
@ -839,7 +846,14 @@ sub InitGL {
glEnable(GL_COLOR_MATERIAL);
glEnable(GL_MULTISAMPLE);
}
sub DestroyGL {
my $self = shift;
if ($self->init && $self->GetContext) {
delete $self->{shader};
}
}
sub Render {
my ($self, $dc) = @_;