4442 Commits

Author	SHA1	Message	Date
Enrico Turri	4e27e57750	Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring	2019-03-28 09:30:23 +01:00
Enrico Turri	e2ad83fa92	Small refactoring -> GLGizmosManager gets model from selection and not from canvas	2019-03-28 09:30:01 +01:00
bubnikv	994cb3a5b9	Merge remote-tracking branch 'remotes/origin/tm_sla_png_minz'	2019-03-28 09:14:37 +01:00
Enrico Turri	fd9fd3ec0c	Layers editing initialized only for 3D view and not for g-code preview	2019-03-28 09:12:32 +01:00
Enrico Turri	5b53dd164d	Selection enabled only for 3D view and not for g-code preview	2019-03-28 08:44:46 +01:00
Enrico Turri	61ea6037fd	Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring	2019-03-28 08:24:25 +01:00
YuSanka	770b731c2c	Fix of SPE-879 and #2021	2019-03-27 17:00:29 +01:00
Enrico Turri	0cd8f8ff79	Follow-up of 8ea8eb67e4, utf-8 path conversion moved into nanosvg library	2019-03-27 15:42:01 +01:00
Enrico Turri	77b5600339	Added #define glcheck() for the case HAS_GLSAFE not defined	2019-03-27 15:14:40 +01:00
Enrico Turri	0cb2196767	Fixed conflicts after merge with master	2019-03-27 14:57:05 +01:00
Enrico Turri	910605864a	Added glsafe() around OpenGL calls where missing	2019-03-27 14:42:09 +01:00
Lukas Matena	846837e02f	SLA gizmo now turns off in case someone adds an object/instance (to prevent rendering points in thin air, etc.) ... Also, a bug appering when adding an object larger than the bed and scaling it down was fixed (sla gizmo did not work correctly in that case)	2019-03-27 14:19:12 +01:00
Vojtech Kral	3a8640a27a	Fix string access in Preferences.cpp	2019-03-27 13:53:00 +01:00
YuSanka	bbabfc8cde	Fix of #2014	2019-03-27 13:19:27 +01:00
Enrico Turri	d3ac8f9322	Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring	2019-03-27 12:51:59 +01:00
Enrico Turri	0fb2c4cfd7	Fixed conflicts after merge with master	2019-03-27 12:51:40 +01:00
Vojtech Kral	73c4a0e10d	Fix build on MSVC with PCH off	2019-03-27 12:14:34 +01:00
Enrico Turri	14332f9b46	Fixed loading of SVG textures from utf-8 paths	2019-03-27 12:02:50 +01:00
Vojtech Kral	7b89bb1785	Merge pull request #2005 from SijmenSchoon/fix-assertions ... Fix tree-related assertions on startup on Linux	2019-03-27 11:29:32 +01:00
tamasmeszaros	6c5fb6430d	Integrating new step, removing old and unused steps.	2019-03-27 10:59:29 +01:00
bubnikv	9cd63af034	Merge branch 'master' of https://github.com/prusa3d/Slic3r	2019-03-27 10:27:01 +01:00
bubnikv	69614c17f5	Improved glsafe macro to print out file name, line number and function ... name on OpenGL assert.	2019-03-27 10:26:55 +01:00
Enrico Turri	00e19f6bd7	Fixed selection lost when Place on Face gizmo is active and user click on another object	2019-03-27 09:06:53 +01:00
Enrico Turri	0426ff1122	Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring	2019-03-27 08:33:48 +01:00
YuSanka	431399daf9	Fix of #2029 ... + Some improvements for the language changing	2019-03-26 18:02:26 +01:00
Vojtech Kral	f527ed0a92	imgui: Fix assert caused by set_language() while new frame is open	2019-03-26 17:57:54 +01:00
tamasmeszaros	fccf1692d8	Fixing broken statistics.	2019-03-26 16:45:04 +01:00
tamasmeszaros	1bc35159ed	Merge branch 'master' into tm_slice_index_lyrh	2019-03-26 16:06:52 +01:00
Enrico Turri	9fd9572691	void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas)	2019-03-26 15:55:47 +01:00
Enrico Turri	2f1a35b49e	Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides	2019-03-26 14:53:32 +01:00
Enrico Turri	871c365cc7	Handling of gizmos related key events moved into new method GLGizmosManager::on_key()	2019-03-26 14:38:30 +01:00
Enrico Turri	0119df2dfc	Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring	2019-03-26 14:08:46 +01:00
Enrico Turri	ae402c1010	Handling of gizmos related char events moved into new method GLGizmosManager::on_char()	2019-03-26 14:08:02 +01:00
bubnikv	6736b7d3a7	Added tooltip [Ctrl - R] to the Slice now button	2019-03-26 14:00:53 +01:00
Enrico Turri	e3fa7b15be	Code cleanup	2019-03-26 12:39:40 +01:00
Enrico Turri	a6a344a014	Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse()	2019-03-26 12:30:17 +01:00
tamasmeszaros	b1a331e43a	Merging with master, solving conflicts.	2019-03-26 11:13:28 +01:00
tamasmeszaros	d2c0d2641c	Further refactor and simplification of slice index and print data.	2019-03-26 10:57:45 +01:00
bubnikv	4d1f8d0d46	Merge branch 'master' of https://github.com/prusa3d/Slic3r	2019-03-26 10:39:08 +01:00
bubnikv	df51a16ffe	Improved SLA layer view: Low layer shall be rendered from the slice above, ... triangulated slices are shifted slightly away from the clipping planes. FDM: Ported a "(bridged)" G-code comment from upstream.	2019-03-26 10:38:50 +01:00
YuSanka	3d1c0f182f	Fixed crash after change of a language ... + Updating of a mode after recreation	2019-03-26 10:09:53 +01:00
Enrico Turri	48f4831ffc	Code cleanup	2019-03-26 09:10:35 +01:00
Enrico Turri	0337ac0839	1st installment of gizmos refactoring ... 1) GLCanvas3D::Gizmos moved into a standalone class GLGizmosManager 2) GLGizmosManager handles mouse events by calling its on_mouse method (wip)	2019-03-26 09:01:04 +01:00
tamasmeszaros	d9d34630a5	Merge branch 'master' into tm_slice_index_lyrh	2019-03-25 19:02:35 +01:00
tamasmeszaros	811c781852	Refactoring and commenting slice index solution.	2019-03-25 19:02:05 +01:00
Sijmen Schoon	e2ca6761f2	Merge branch 'master' into fix-assertions	2019-03-25 17:24:04 +01:00
Enrico Turri	c50986d7fd	Code cleanup	2019-03-25 14:13:20 +01:00
Enrico Turri	4fa2a5e3b2	Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models	2019-03-25 14:12:40 +01:00
Enrico Turri	b7691980f1	Fix of #1998	2019-03-25 12:07:43 +01:00
Enrico Turri	c0db8a6bfd	Yet another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse()	2019-03-25 08:48:41 +01:00