tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								4ece50e3db 
								
							 
						 
						
							
							
								
								Merge branch 'master' into tm_slice_index  
							
							
							
						 
						
							2019-03-22 15:31:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								d165dbb498 
								
							 
						 
						
							
							
								
								Refactoring changes to the slice index.  
							
							
							
						 
						
							2019-03-22 15:31:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								6bf0cf9466 
								
							 
						 
						
							
							
								
								Another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse()  
							
							
							
						 
						
							2019-03-22 14:35:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								db21c67f18 
								
							 
						 
						
							
							
								
								Changed logic for releasing mouse capture into GLToolbar::on_mouse()  
							
							
							
						 
						
							2019-03-22 13:03:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								f5516f24c4 
								
							 
						 
						
							
							
								
								Fix of 1.42 beta crash when deleting printer profile created by configuration assistant  #1985  
							
							... 
							
							
							
							Fixed an issue, where deleting a profile did not correctly update
profile dependences, and deleting a profile would not test dirty status
of depending profiles, which would be switched thus user changes would be lost.
Fixed enabling / disabling the --default FFF-- / --default SLA-- profiles
when deleting the last printer profile.
Little refactoring (don't compare by strings but by symbolic names).
Making a copy of a profile - "Copy" suffix is added to a system profile. 
							
						 
						
							2019-03-22 12:11:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								bbb2a6d714 
								
							 
						 
						
							
							
								
								Fixed non-uniform scale of single volumes selection when made using the sidebar matrix fields  
							
							
							
						 
						
							2019-03-22 11:51:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								0848617fd3 
								
							 
						 
						
							
							
								
								SLA gizmo fix: adding points to selection by Shift+click should now work again (was broken by  8466c55)  
							
							
							
						 
						
							2019-03-22 10:56:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								a5fd9a34e8 
								
							 
						 
						
							
							
								
								Do not consider modifiers when centering an object after 3mf and amf import  
							
							
							
						 
						
							2019-03-22 09:47:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								5e646562cd 
								
							 
						 
						
							
							
								
								Fixes for the duplicated layer issues...  
							
							
							
						 
						
							2019-03-21 18:01:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								0ffc0c3a84 
								
							 
						 
						
							
							
								
								Merge branch 'master' into tm_slice_index  
							
							
							
						 
						
							2019-03-21 15:17:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								24a5dd4235 
								
							 
						 
						
							
							
								
								FIx for broken slice preview  
							
							
							
						 
						
							2019-03-21 15:16:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								562343cd2a 
								
							 
						 
						
							
							
								
								Localization fix of the warning texts in the 3D scene.  
							
							... 
							
							
							
							Improved anti-aliasing of the warning texts in the 3D scene
and the G-code legend. A ClearType rendering has been suppressed
by rendering of the text into a red channel only. 
							
						 
						
							2019-03-21 14:33:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								d4dde12d0d 
								
							 
						 
						
							
							
								
								Slic3r compiles with the new slice index interface.  
							
							
							
						 
						
							2019-03-21 12:25:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								f9e3b935d3 
								
							 
						 
						
							
							
								
								Yet another fix.  
							
							
							
						 
						
							2019-03-21 12:09:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								f76880cd5e 
								
							 
						 
						
							
							
								
								Fix and optimization of the previous commit.  
							
							
							
						 
						
							2019-03-21 11:54:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								213ff2852a 
								
							 
						 
						
							
							
								
								We are getting mysterious crashes on Linux in gtk due to OpenGL context activation GH  #1874   #1955 .  
							
							... 
							
							
							
							So we are applying a workaround here, just on linux. 
							
						 
						
							2019-03-21 11:44:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								a8cf701520 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into et_canvas_gui_refactoring  
							
							
							
						 
						
							2019-03-21 11:05:19 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								024efd963a 
								
							 
						 
						
							
							
								
								Renamed private methods of Selection  
							
							
							
						 
						
							2019-03-21 11:02:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								8105fc33d5 
								
							 
						 
						
							
							
								
								Fixed a merge issue  
							
							
							
						 
						
							2019-03-21 10:46:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								d9d0eff0f1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/ys_comboboxes'  
							
							
							
						 
						
							2019-03-21 10:11:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								a5b27a7540 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  
							
							
							
						 
						
							2019-03-21 10:07:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								0198e71789 
								
							 
						 
						
							
							
								
								Implemented issue  #1990  
							
							
							
						 
						
							2019-03-21 09:37:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								452eb62f11 
								
							 
						 
						
							
							
								
								Some code refactoring  
							
							
							
						 
						
							2019-03-20 16:22:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								3a923b7121 
								
							 
						 
						
							
							
								
								Fixed conflicts after merge with master  
							
							
							
						 
						
							2019-03-20 16:09:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								8b73608e9f 
								
							 
						 
						
							
							
								
								SLA gizmo can be activated if the supports are outside the bed  
							
							... 
							
							
							
							Otherwise there is a possibility that the object gets out of bed when the gizmo is active (supports are generated with object close to the edge), which the gizmo does not expect 
							
						 
						
							2019-03-20 15:37:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								42c5d624cb 
								
							 
						 
						
							
							
								
								Fix into GLToolbar::on_mouse()  
							
							
							
						 
						
							2019-03-20 15:30:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								83b24eee5b 
								
							 
						 
						
							
							
								
								Added missing include  
							
							
							
						 
						
							2019-03-20 14:36:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								9a2d7c881b 
								
							 
						 
						
							
							
								
								Fixed typo  
							
							
							
						 
						
							2019-03-20 14:14:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								8466c55b78 
								
							 
						 
						
							
							
								
								SLA gizmo - points are added on leftdown event, not leftup as before  
							
							
							
						 
						
							2019-03-20 14:04:59 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								df01af975a 
								
							 
						 
						
							
							
								
								SLA gizmo now forces objects to use their normal color (not SELECTED_COLOR)  
							
							
							
						 
						
							2019-03-20 14:04:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								d23824af97 
								
							 
						 
						
							
							
								
								GLCanvas3D::Gizmos as a standalone class (GLGizmosManager)  
							
							
							
						 
						
							2019-03-20 13:51:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								2728e45646 
								
							 
						 
						
							
							
								
								Renamed function mouse_event to gizmo_event  
							
							
							
						 
						
							2019-03-20 13:44:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								e2349bdd2e 
								
							 
						 
						
							
							
								
								Added workaround for the non-editable wxBitmapComboBoxs under OSXDisableAllSmartSubstitutions  
							
							... 
							
							
							
							+ experiments with Linux 
							
						 
						
							2019-03-20 12:04:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								2f244895d2 
								
							 
						 
						
							
							
								
								Small fix for cancel button text on Linux  
							
							
							
						 
						
							2019-03-20 11:12:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								001d0c0fe9 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  
							
							
							
						 
						
							2019-03-20 10:34:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								b36e4fa512 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/ys_preset_edit_buttons' into ys_comboboxes  
							
							
							
						 
						
							2019-03-20 10:33:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								438010f0f8 
								
							 
						 
						
							
							
								
								Some code refactoring  
							
							
							
						 
						
							2019-03-20 10:14:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								4ceba39d99 
								
							 
						 
						
							
							
								
								Decreased number of polygons on the SLA support point marks for faster rendering  
							
							
							
						 
						
							2019-03-20 10:13:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								df250039df 
								
							 
						 
						
							
							
								
								Tech ENABLE_CANVAS_GUI_REFACTORING set as default  
							
							
							
						 
						
							2019-03-20 09:33:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								4d37c8658d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/ys_preset_edit_buttons'  
							
							
							
						 
						
							2019-03-19 17:37:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								3b31976b09 
								
							 
						 
						
							
							
								
								Another fix for Linuz and Mac builds  
							
							
							
						 
						
							2019-03-19 15:58:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								b57f6c9fe0 
								
							 
						 
						
							
							
								
								Fixed build on Linux and Mac  
							
							
							
						 
						
							2019-03-19 15:33:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								b7a1bd927a 
								
							 
						 
						
							
							
								
								Some improvements  
							
							
							
						 
						
							2019-03-19 14:36:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								80c1a8d8e4 
								
							 
						 
						
							
							
								
								GLCanvas3D::Selection as a standalone class  
							
							
							
						 
						
							2019-03-19 13:30:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								630d266c4b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into tm_sla_png_minz  
							
							
							
						 
						
							2019-03-19 13:19:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								3617284385 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/ys_preset_edit_buttons'  
							
							
							
						 
						
							2019-03-19 11:54:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								b50c4cbaa3 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  
							
							
							
						 
						
							2019-03-19 11:53:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								ca623b9a83 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into et_canvas_gui_refactoring  
							
							
							
						 
						
							2019-03-19 10:59:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								731e5a36b7 
								
							 
						 
						
							
							
								
								Commit  4a8a1fac7b re-made as linux-only  
							
							
							
						 
						
							2019-03-19 10:54:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								5bb89f4da2 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into et_canvas_gui_refactoring  
							
							
							
						 
						
							2019-03-19 10:48:51 +01:00