prusa3d · CounterPillow · May 9, 2018 · May 9, 2018
diff --git a/data/img/LineAngle1.png b/data/img/LineAngle1.png
diff --git a/data/img/LineAngle2.png b/data/img/LineAngle2.png
diff --git a/data/img/LineAngle3.png b/data/img/LineAngle3.png
diff --git a/data/img/MK3.png b/data/img/MK3.png
diff --git a/data/img/MK3_bottom_alpha.png b/data/img/MK3_bottom_alpha.png
diff --git a/data/img/PrintBed04.png b/data/img/PrintBed04.png
diff --git a/data/img/PrintBed04_GRID.png b/data/img/PrintBed04_GRID.png
diff --git a/data/img/background.png b/data/img/background.png
diff --git a/data/img/checker.png b/data/img/checker.png
diff --git a/data/img/gui/arrow_down_objectadjust_hover.png b/data/img/gui/arrow_down_objectadjust_hover.png
diff --git a/data/img/gui/arrow_down_objectadjust_off.png b/data/img/gui/arrow_down_objectadjust_off.png
diff --git a/data/img/gui/arrow_down_objectadjust_on.png b/data/img/gui/arrow_down_objectadjust_on.png
diff --git a/data/img/gui/arrow_dropdownmenu.png b/data/img/gui/arrow_dropdownmenu.png
diff --git a/data/img/gui/arrow_dropdownmenu_bright.png b/data/img/gui/arrow_dropdownmenu_bright.png
diff --git a/data/img/gui/arrow_up_objectadjust_hover.png b/data/img/gui/arrow_up_objectadjust_hover.png
diff --git a/data/img/gui/arrow_up_objectadjust_off.png b/data/img/gui/arrow_up_objectadjust_off.png
diff --git a/data/img/gui/arrow_up_objectadjust_on.png b/data/img/gui/arrow_up_objectadjust_on.png
diff --git a/data/img/gui/backarrow_hover.png b/data/img/gui/backarrow_hover.png
diff --git a/data/img/gui/backarrow_off.png b/data/img/gui/backarrow_off.png
diff --git a/data/img/gui/backarrow_on.png b/data/img/gui/backarrow_on.png
diff --git a/data/img/gui/button_mask_a.png b/data/img/gui/button_mask_a.png
diff --git a/data/img/gui/button_mask_b.png b/data/img/gui/button_mask_b.png
diff --git a/data/img/gui/button_mask_c.png b/data/img/gui/button_mask_c.png
diff --git a/data/img/gui/checkbox_dark_off.png b/data/img/gui/checkbox_dark_off.png
diff --git a/data/img/gui/checkbox_dark_off_disabled.png b/data/img/gui/checkbox_dark_off_disabled.png
diff --git a/data/img/gui/checkbox_dark_off_hover.png b/data/img/gui/checkbox_dark_off_hover.png
diff --git a/data/img/gui/checkbox_off.png b/data/img/gui/checkbox_off.png
diff --git a/data/img/gui/checkbox_off_hover.png b/data/img/gui/checkbox_off_hover.png
diff --git a/data/img/gui/checkbox_on.png b/data/img/gui/checkbox_on.png
diff --git a/data/img/gui/checkbox_on_disabled.png b/data/img/gui/checkbox_on_disabled.png
diff --git a/data/img/gui/checkbox_on_hover.png b/data/img/gui/checkbox_on_hover.png
diff --git a/data/img/gui/colorchange_add_off.png b/data/img/gui/colorchange_add_off.png
diff --git a/data/img/gui/colorchange_add_on.png b/data/img/gui/colorchange_add_on.png
diff --git a/data/img/gui/colorchange_delete_off.png b/data/img/gui/colorchange_delete_off.png
diff --git a/data/img/gui/colorchange_delete_on.png b/data/img/gui/colorchange_delete_on.png
diff --git a/data/img/gui/deletebutton.png b/data/img/gui/deletebutton.png
diff --git a/data/img/gui/disable_checkbox_off.png b/data/img/gui/disable_checkbox_off.png
diff --git a/data/img/gui/disable_checkbox_on.png b/data/img/gui/disable_checkbox_on.png
diff --git a/data/img/gui/disable_down_objectadjust.png b/data/img/gui/disable_down_objectadjust.png
diff --git a/data/img/gui/disable_up_objectadjust.png b/data/img/gui/disable_up_objectadjust.png
diff --git a/data/img/gui/forwardarrow_hover.png b/data/img/gui/forwardarrow_hover.png
diff --git a/data/img/gui/forwardarrow_off.png b/data/img/gui/forwardarrow_off.png
diff --git a/data/img/gui/forwardarrow_on.png b/data/img/gui/forwardarrow_on.png
diff --git a/data/img/gui/help.png b/data/img/gui/help.png
diff --git a/data/img/gui/help_light_dissabled_s.png b/data/img/gui/help_light_dissabled_s.png
diff --git a/data/img/gui/help_light_hover_s.png b/data/img/gui/help_light_hover_s.png
diff --git a/data/img/gui/help_light_normal_s.png b/data/img/gui/help_light_normal_s.png
diff --git a/data/img/gui/help_light_on_s.png b/data/img/gui/help_light_on_s.png
diff --git a/data/img/gui/info_icon.png b/data/img/gui/info_icon.png
diff --git a/data/img/gui/multi_hover.png b/data/img/gui/multi_hover.png
diff --git a/data/img/gui/multi_off.png b/data/img/gui/multi_off.png
diff --git a/data/img/gui/multi_on.png b/data/img/gui/multi_on.png
diff --git a/data/img/gui/organize_hover.png b/data/img/gui/organize_hover.png
diff --git a/data/img/gui/organize_off.png b/data/img/gui/organize_off.png
diff --git a/data/img/gui/organize_on.png b/data/img/gui/organize_on.png
diff --git a/data/img/gui/placeonface_hover.png b/data/img/gui/placeonface_hover.png
diff --git a/data/img/gui/placeonface_off.png b/data/img/gui/placeonface_off.png
diff --git a/data/img/gui/placeonface_on.png b/data/img/gui/placeonface_on.png
diff --git a/data/img/gui/plusbutton.png b/data/img/gui/plusbutton.png
diff --git a/data/img/gui/popup_window.png b/data/img/gui/popup_window.png
diff --git a/data/img/gui/remove_off.png b/data/img/gui/remove_off.png
diff --git a/data/img/gui/remove_on.png b/data/img/gui/remove_on.png
diff --git a/data/img/gui/reset_dark_hover_s.png b/data/img/gui/reset_dark_hover_s.png
diff --git a/data/img/gui/reset_dark_normal_s.png b/data/img/gui/reset_dark_normal_s.png
diff --git a/data/img/gui/reset_dark_on_s.png b/data/img/gui/reset_dark_on_s.png
diff --git a/data/img/gui/reset_light_dissabled_s.png b/data/img/gui/reset_light_dissabled_s.png
diff --git a/data/img/gui/reset_light_hover_s.png b/data/img/gui/reset_light_hover_s.png
diff --git a/data/img/gui/reset_light_normal_s.png b/data/img/gui/reset_light_normal_s.png
diff --git a/data/img/gui/reset_light_on_s.png b/data/img/gui/reset_light_on_s.png
diff --git a/data/img/gui/rotate_hover.png b/data/img/gui/rotate_hover.png
diff --git a/data/img/gui/rotate_off.png b/data/img/gui/rotate_off.png
diff --git a/data/img/gui/rotate_on.png b/data/img/gui/rotate_on.png
diff --git a/data/img/gui/scale_hover.png b/data/img/gui/scale_hover.png
diff --git a/data/img/gui/scale_off.png b/data/img/gui/scale_off.png
diff --git a/data/img/gui/scale_on.png b/data/img/gui/scale_on.png
diff --git a/data/img/gui/scalelock_off.png b/data/img/gui/scalelock_off.png
diff --git a/data/img/gui/scalelock_off_disabled.png b/data/img/gui/scalelock_off_disabled.png
diff --git a/data/img/gui/scalelock_off_hover.png b/data/img/gui/scalelock_off_hover.png
diff --git a/data/img/gui/scalelock_on.png b/data/img/gui/scalelock_on.png
diff --git a/data/img/gui/scalelock_on_disabled.png b/data/img/gui/scalelock_on_disabled.png
diff --git a/data/img/gui/scalelock_on_hover.png b/data/img/gui/scalelock_on_hover.png
diff --git a/data/img/gui/slider_knob.png b/data/img/gui/slider_knob.png
diff --git a/data/img/gui/slider_knob_2.png b/data/img/gui/slider_knob_2.png
diff --git a/data/img/gui/slider_path.png b/data/img/gui/slider_path.png
diff --git a/data/img/gui/slider_path_vert.png b/data/img/gui/slider_path_vert.png
diff --git a/data/img/gui/support_hover.png b/data/img/gui/support_hover.png
diff --git a/data/img/gui/support_off.png b/data/img/gui/support_off.png
diff --git a/data/img/gui/support_on.png b/data/img/gui/support_on.png
diff --git a/data/img/gui/tool_mask.png b/data/img/gui/tool_mask.png
diff --git a/data/img/gui/warning_icon.png b/data/img/gui/warning_icon.png
diff --git a/data/img/splashscreen.png b/data/img/splashscreen.png
diff --git a/data/img/splashscreen_osx.png b/data/img/splashscreen_osx.png
diff --git a/sceneRender.py b/sceneRender.py
@@ -245,15 +245,15 @@ def set_z_rotation(self, angle):
             #print("Z rot: " + str(self.zRot))
 
     def texture_from_png(self, filename, gen_mipmap=True):
-        mode_to_bpp = {'1':1, 'L':8, 'P':8, 'RGB':24, 'RGBA':32, 'CMYK':32, 'YCbCr':24, 'I':32, 'F':32}
-
         img = open(filename)
         img = img.transpose(FLIP_TOP_BOTTOM)
-        bpp = mode_to_bpp[img.mode]
-        if bpp == 32:
+        if (img.mode in ('RGBA', 'LA') or
+            (img.mode == 'P' and 'transparency' in img.info)):
             type = GL_RGBA
+            img = img.convert(mode='RGBA')
         else:
             type = GL_RGB
+            img = img.convert(mode='RGB')
         img_data = numpy.array(list(img.getdata()), numpy.uint8)
 
         texture = glGenTextures(1)
@@ -1747,4 +1747,4 @@ def _gl_vector(array, *args):
     if len(args) > 0:
         array = numpy.append(array, args)
     vector = (GLfloat * len(array))(*array)
-    return vector
+    return vector