From ff3234d8f05ed6d4a2c00fcc4e6b14907ec6aa26 Mon Sep 17 00:00:00 2001
From: Benjamin Landers <benjaminrlanders@gmail.com>
Date: Mon, 4 Jun 2018 18:29:15 -0700
Subject: [PATCH] Fixes related to Face Rotation (#4437)

* Adjust size of icon to match others

* Make the rotate button disabled if a face is not selected

* Fix color issue
---
 lib/Slic3r/GUI/3DScene.pm                       |   1 +
 lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm |   3 +++
 var/rotate_face.png                             | Bin 643 -> 478 bytes
 3 files changed, 4 insertions(+)

diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 8835ff94b..d59e8da5e 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -1112,6 +1112,7 @@ sub draw_volumes {
             $min_offset //= 0;
             $max_offset //= $volume->qverts->size;
             
+            glColor4f(@baseColor);
             glVertexPointer_c(3, GL_FLOAT, 0, $volume->qverts->verts_ptr);
             glNormalPointer_c(GL_FLOAT, 0, $volume->qverts->norms_ptr);
             glDrawArrays(GL_QUADS, $min_offset / 3, ($max_offset-$min_offset) / 3);
diff --git a/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm b/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm
index e39ab5978..b1b84e7be 100644
--- a/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm
+++ b/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm
@@ -54,6 +54,7 @@ sub new {
         
         $self->{btn_rot} = Wx::Button->new($self, -1, "Rotate to Plane", wxDefaultPosition, wxDefaultSize);
         $self->{btn_rot}->SetDefault;
+        $self->{btn_rot}->Disable;
         $button_sizer->Add($self->{btn_rot}, 0, wxALIGN_RIGHT | wxALL, 10);
         $optgroup->append_line(Slic3r::GUI::OptionsGroup::Line->new(
             sizer => $button_sizer,
@@ -77,7 +78,9 @@ sub new {
         $canvas->zoom_to_volumes;
         $canvas->on_select(sub {
             my ($volume_idx) = @_;
+            $self->{btn_rot}->Disable;
             $self->{normal} = $canvas->calculate_normal($volume_idx);
+            $self->{btn_rot}->Enable if defined $self->{normal};
         });
     }
     
diff --git a/var/rotate_face.png b/var/rotate_face.png
index ec7652ae2049451f88e76f1a68d50fcd38325fc3..8268ee912798e1fb3f9a016d2e64a33b9d1ad8cc 100644
GIT binary patch
delta 441
zcmV;q0Y?6V1>OT8iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy*e+B{r
z0|1+Pz?c940c%M_K~y-)t<yh9)NvRF@XsAr5JsDkH$*|BMK?rC;nEU9SP<9HnnBSL
z7qnayZ51@PG~Ht2&jeliH=RR6H0Y#>gCU{~35j%`ybb-R)B97R54?Q8!}~nn=Y4p;
z>=GHU=!|YX!dEQVZ)ImPuN18cf3+>Ou4YQjh?>X3%?FR<TMN8)(73SCB=WoJ;^|#;
zon0hmRfWw4;)dv66!S;@NXRGjY^P-#?iEY;k|wi{OXDo(#qxq8DySrUYUkjrL>Ly?
zZ{o$E2qNg;+U8BCF~X=QU;9J8-`rxflfak>vDzhqp%&yj2~!F868g4he*nX$XE?NG
zIzzF=6aDDL6V#gp4tsa`qs<H_+jzX4o|9LY{JV)M&OQ5_J-#%3V*W^Pz1@_z%6-q@
zUM)YIJ#}HNS}M$B8py|R9@lXI(MBVOpO~wb3O8~oc>sgB_#cbEg7?ypa}D8q$IE|w
jymfr2mI@>G3cmpL*pYWG53g5j00000NkvXXu0mjfQ0mKi

delta 607
zcmV-l0-*ig1A_%2iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPke+3@^
zIVOus(ANL}0uV_=K~z}7?bb_3R8brT@ZYVb>_Iy#qD>GH7{NdpK3bNwOsIv}F0d$Q
zkwnxYs!a<QZK_q!q9~N6T2y2Z2%{~O+ysI|rUexeg&}EHr^Vb}qT>v6Z8aZU&bjA)
z_kX_ge{m?Ij521!YtjGMCYnRUe@CkgVHhv*0wZ{XVT*m5UjZ2pG}t4Rm-QhQHHaZ8
zuPfhrIJ(wQ>Hf($?2+J`;A;U-5Kf&p5m=c_fHErG7WCy85lsrIaiP0L2&@m1%%6-=
z9fFZr1bi3Ly~39YA+W1h^9u^#v|ET?OicTd;^YOMZKGnssff<x>m;K=e@2iI+!svc
zPQLJq&|ND8Lg3c?RKXt+;rDzERV(PLrecC|20Gb<$=F^ub~iGWR0zaIb9l$|ExFAx
zww%q_AUAG`Syu}6z@h?q_fQ81y8c<;81W-+Qn9m~#uFS&(gPj8lJ3x-G^>kvKLht0
zmL^#RG<t=x6`!dc07oNwe@Z-5(d2tAxzk^bxHNOF+KcLV-jty^sT`ovoqav3qWrPF
zi6!y;Mm%0m#sll!-9BjR9IWHh-j5{H2a4)j#<2`<8(EuV4it(L@z|7HC!7KGZT+jT
zjla5NjGgUgYaZ`E^K|-pwl)1A5drmW{TFep$ltQr*7S~&1k|_nHMih$k)eBo=4@-a
ttF$uAVI9sDA^cUgHGQpo!!IKregYBTz{fV7-yZ+~002ovPDHLkV1fr%6lVYc