Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								251a7d1329 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_labels  
							
							
							
						 
						
							2020-02-03 08:23:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								3f7ebee396 
								
							 
						 
						
							
							
								
								ObjectDataViewModel is extracted from wxExtentions to the separated file  
							
							... 
							
							
							
							+ parse_color function is moved to BitmapCache from PresetBundle 
							
						 
						
							2020-02-02 22:22:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								eb6e0c06e4 
								
							 
						 
						
							
							
								
								Mark a tick as a conflict, if it has a ToolChange to the same extruder  
							
							
							
						 
						
							2020-02-02 21:20:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								438f4fd1aa 
								
							 
						 
						
							
							
								
								Fixed build under OSX  
							
							
							
						 
						
							2020-02-02 19:40:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								be92e10985 
								
							 
						 
						
							
							
								
								Added missed include for OSX  
							
							
							
						 
						
							2020-01-31 21:03:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								1472ad9b14 
								
							 
						 
						
							
							
								
								To fix blurred icons under OSX there is implemented PresetBitmapComboBox, derived from wxBitmapComboBox,  
							
							... 
							
							
							
							which now will be used for preset choosers on sidebar a preset tabs.
+ for BitmapCache class added m_scale used for correct scaling of SVG images on Retina displays
+ some code clearing from unused functions or function's parameters 
							
						 
						
							2020-01-31 16:57:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								378321231f 
								
							 
						 
						
							
							
								
								Fix of tripping glAssert after switching to Preview on Linux/GTK2  
							
							... 
							
							
							
							(fix suggested and thus approved by @enricoturri1966) 
							
						 
						
							2020-01-31 14:50:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								61e9cb0f72 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  
							
							
							
						 
						
							2020-01-31 12:15:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								3a99b23ec7 
								
							 
						 
						
							
							
								
								#3580  - Added menu item 'Edit/Reload from disk' and F5 key acceleration to reload the entire plater  
							
							
							
						 
						
							2020-01-31 12:15:04 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								36e92b0141 
								
							 
						 
						
							
							
								
								Put hole drilling into separate step  
							
							
							
						 
						
							2020-01-31 08:58:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								4bc4e347fb 
								
							 
						 
						
							
							
								
								Fixed a crash during cut (typo introduced in  645f13a)  
							
							
							
						 
						
							2020-01-31 08:54:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								9ef65b23d8 
								
							 
						 
						
							
							
								
								Implemented loading of hollowed SLA mesh into the scene  
							
							... 
							
							
							
							in place of the normal mesh.
WIP: The code is inefficient (it does not store the timestamp
of the hollowed mesh, therefore it refreshes the hollowed mesh on each
scene update) and if the hollowing gets invalidated, the original mesh
is currently not being reloaded and the hollowed mesh is still visible. 
							
						 
						
							2020-01-30 17:58:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								a6f7fc93f4 
								
							 
						 
						
							
							
								
								Gizmo updates - forget everything about the loaded mesh when an object is deselected  
							
							
							
						 
						
							2020-01-30 15:26:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								570f77cbdc 
								
							 
						 
						
							
							
								
								Implemented DnD for objects inside ObjectList  
							
							
							
						 
						
							2020-01-30 15:01:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								4f43c6d3f8 
								
							 
						 
						
							
							
								
								SlaSupports gizmo - most of updating now assumes that common data struct is updated properly  
							
							
							
						 
						
							2020-01-30 14:31:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								08dcbd0271 
								
							 
						 
						
							
							
								
								Hollowing gizmo - most of updating now assumes that common data struct is updated properly  
							
							
							
						 
						
							2020-01-30 14:31:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								1278aabf3e 
								
							 
						 
						
							
							
								
								Fixed some compiler warnings.  
							
							
							
						 
						
							2020-01-30 13:00:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								c5fa400208 
								
							 
						 
						
							
							
								
								Fixed regression of  71fa411100 
							
							... 
							
							
							
							where the PrintObject bounding box was not invalidated correctly
when the transformation matrices of instances changed.
Also refactored PrintObject::size() for const correctness. 
							
						 
						
							2020-01-30 12:22:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								b0aa937215 
								
							 
						 
						
							
							
								
								Trying to improve drilling stability by handling CGAL exceptions  
							
							
							
						 
						
							2020-01-29 15:57:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								0407634824 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_labels  
							
							
							
						 
						
							2020-01-29 15:46:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								e679bcced6 
								
							 
						 
						
							
							
								
								Follow-up of  17a6b696e7 -> Fixed missing imgui window size initialization  
							
							
							
						 
						
							2020-01-29 15:40:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								16fa68df0c 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_labels  
							
							
							
						 
						
							2020-01-29 14:46:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								da3cb30b7c 
								
							 
						 
						
							
							
								
								Follow-up of  17a6b696e7 -> Fixed build when tech ENABLE_6DOF_CAMERA is disabled  
							
							
							
						 
						
							2020-01-29 14:44:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								7156ed9987 
								
							 
						 
						
							
							
								
								Remove redundant code  
							
							
							
						 
						
							2020-01-29 14:13:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								b41c6d7d64 
								
							 
						 
						
							
							
								
								Refuse to drill a broken mesh  
							
							... 
							
							
							
							Hole parameters defaults and limits changed a bit 
							
						 
						
							2020-01-29 14:07:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								504413cc91 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_labels  
							
							
							
						 
						
							2020-01-29 12:31:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								f7f1e2ce42 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  
							
							
							
						 
						
							2020-01-29 12:09:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								17a6b696e7 
								
							 
						 
						
							
							
								
								Workaround to fix SPE-1082 + refactoring of 6 dof camera  
							
							
							
						 
						
							2020-01-29 12:08:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								3f73261fdb 
								
							 
						 
						
							
							
								
								Fixed transformation of the hollowed mesh to be used at frontend  
							
							... 
							
							
							
							Common gizmos data update is called from GLGizmoManager 
							
						 
						
							2020-01-29 10:08:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								46fdce1169 
								
							 
						 
						
							
							
								
								SLA gizmos can now fetch hollowed and drilled mesh from the backend  
							
							
							
						 
						
							2020-01-29 10:08:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								76927ce399 
								
							 
						 
						
							
							
								
								REVERT LATER: TEMPORARILY MANGLED reload_scene FUNCTION  
							
							... 
							
							
							
							This commit horribly cripples reload_scene function just to update volumes in scene so that Hollowing and SLASupport gizmos can be updated to the new logic
    It should be later reverted and the same be achieved in a better way 
							
						 
						
							2020-01-29 10:07:59 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								5ae2f8a467 
								
							 
						 
						
							
							
								
								Function sla_trafo made accessible from outside SLAPrint.cpp unit  
							
							
							
						 
						
							2020-01-29 10:07:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								d45744b7bb 
								
							 
						 
						
							
							
								
								Typo fix for  a38735b4ae 
							
							
							
						 
						
							2020-01-28 16:40:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								cd2973fad3 
								
							 
						 
						
							
							
								
								Typo fix for  a38735b4ae 
							
							
							
						 
						
							2020-01-28 16:23:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								a38735b4ae 
								
							 
						 
						
							
							
								
								More fix of svg icons scaling under OSX (to avoid icon's blurring)  
							
							... 
							
							
							
							+ some code cleaning from unused text 
							
						 
						
							2020-01-28 16:17:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								9032dadff3 
								
							 
						 
						
							
							
								
								Added extra frame renders to let labels grow to their final size  
							
							
							
						 
						
							2020-01-28 15:57:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								6988752d05 
								
							 
						 
						
							
							
								
								Re-apply fix for Win32  
							
							
							
						 
						
							2020-01-28 15:24:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								9d0d0cde21 
								
							 
						 
						
							
							
								
								Fix broken build on non-linux platforms  
							
							
							
						 
						
							2020-01-28 15:08:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								04a58e41c4 
								
							 
						 
						
							
							
								
								Fix cgal when used from distro package  
							
							... 
							
							
							
							fix CMake -frounding-math propagation from CGAL. 
							
						 
						
							2020-01-28 14:49:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								d5b258c267 
								
							 
						 
						
							
							
								
								1st installment of object/instance labels in 3D scene  
							
							
							
						 
						
							2020-01-28 13:15:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								69549af9ac 
								
							 
						 
						
							
							
								
								Invalidate object bounding box after arrange  
							
							
							
						 
						
							2020-01-28 11:11:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								15cb8ec653 
								
							 
						 
						
							
							
								
								Another refactoring into class Camera  
							
							
							
						 
						
							2020-01-28 09:13:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								635def1648 
								
							 
						 
						
							
							
								
								Fixed an icon scaling in the ObjectList under OSX  
							
							
							
						 
						
							2020-01-27 16:30:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								cf7d7bd40f 
								
							 
						 
						
							
							
								
								Fixed menu icons scaling under OSX  
							
							
							
						 
						
							2020-01-27 14:58:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								d8b1d074a1 
								
							 
						 
						
							
							
								
								Implemented upgrade_text_entry_dialog() fuction to avoid a getting an empty string from wxTextEntryDialog (disable OK button, if TextCtrl is empty)  
							
							... 
							
							
							
							All mode conflicting or meaningless ticks are marked by "exclamation" icon and described in tooltip. 
							
						 
						
							2020-01-27 14:36:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								be8f464bf8 
								
							 
						 
						
							
							
								
								Remove some gtk warnings on application start.  
							
							
							
						 
						
							2020-01-27 14:31:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								83e8cfa206 
								
							 
						 
						
							
							
								
								Small refactoring into class Camera  
							
							
							
						 
						
							2020-01-27 13:39:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								dced3ce783 
								
							 
						 
						
							
							
								
								Fix of 2.2.0-A3: Sequential Printing: Wrong location after slicing  #3570  
							
							... 
							
							
							
							This is a regression from 71fa411 
							
						 
						
							2020-01-24 17:11:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								6945a20e9a 
								
							 
						 
						
							
							
								
								Merge branch 'tm_sla_full_config'  
							
							
							
						 
						
							2020-01-24 15:25:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								848fe4750f 
								
							 
						 
						
							
							
								
								Add prusaslicer.ini to sl1 output zip  
							
							
							
						 
						
							2020-01-24 15:23:59 +01:00