bubnikv
|
fc49abc2a4
|
Merge remote-tracking branch 'remotes/origin/tm_sla_png_minz'
|
2019-03-28 09:14:37 +01:00 |
|
Enrico Turri
|
98a848d239
|
Layers editing initialized only for 3D view and not for g-code preview
|
2019-03-28 09:12:32 +01:00 |
|
Enrico Turri
|
a4f404a6a4
|
Selection enabled only for 3D view and not for g-code preview
|
2019-03-28 08:44:46 +01:00 |
|
Enrico Turri
|
702186eec3
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
|
2019-03-28 08:24:25 +01:00 |
|
YuSanka
|
3c163285e5
|
Fix of SPE-879 and #2021
|
2019-03-27 17:00:29 +01:00 |
|
Enrico Turri
|
46eafca0eb
|
Follow-up of 8ea8eb67e4 , utf-8 path conversion moved into nanosvg library
|
2019-03-27 15:42:01 +01:00 |
|
Enrico Turri
|
d0046283fa
|
Added #define glcheck() for the case HAS_GLSAFE not defined
|
2019-03-27 15:14:40 +01:00 |
|
Enrico Turri
|
8459410e3c
|
Fixed conflicts after merge with master
|
2019-03-27 14:57:05 +01:00 |
|
Enrico Turri
|
d795f07e7b
|
Added glsafe() around OpenGL calls where missing
|
2019-03-27 14:42:09 +01:00 |
|
Lukas Matena
|
490074a2dd
|
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
|
1e9e378659
|
Fix string access in Preferences.cpp
|
2019-03-27 13:53:00 +01:00 |
|
YuSanka
|
87febaacc0
|
Fix of #2014
|
2019-03-27 13:19:27 +01:00 |
|
Enrico Turri
|
30c4e4fed6
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
|
2019-03-27 12:51:59 +01:00 |
|
Enrico Turri
|
c44b6a30f9
|
Fixed conflicts after merge with master
|
2019-03-27 12:51:40 +01:00 |
|
Vojtech Kral
|
734d57a714
|
Fix build on MSVC with PCH off
|
2019-03-27 12:14:34 +01:00 |
|
Enrico Turri
|
8ea8eb67e4
|
Fixed loading of SVG textures from utf-8 paths
|
2019-03-27 12:02:50 +01:00 |
|
Vojtech Kral
|
8dbbfc140b
|
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
|
bc74761513
|
Integrating new step, removing old and unused steps.
|
2019-03-27 10:59:29 +01:00 |
|
bubnikv
|
84ff7f4221
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r
|
2019-03-27 10:27:01 +01:00 |
|
bubnikv
|
3987296b62
|
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
|
3cd6db2278
|
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
|
000542f48d
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
|
2019-03-27 08:33:48 +01:00 |
|
YuSanka
|
c8291c6e52
|
Fix of #2029
+ Some improvements for the language changing
|
2019-03-26 18:02:26 +01:00 |
|
Vojtech Kral
|
937f6112ce
|
imgui: Fix assert caused by set_language() while new frame is open
|
2019-03-26 17:57:54 +01:00 |
|
tamasmeszaros
|
4d8800bc8a
|
Fixing broken statistics.
|
2019-03-26 16:45:04 +01:00 |
|
tamasmeszaros
|
4c972549fb
|
Merge branch 'master' into tm_slice_index_lyrh
|
2019-03-26 16:06:52 +01:00 |
|
Enrico Turri
|
fee0a6b6b5
|
void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas)
|
2019-03-26 15:55:47 +01:00 |
|
Enrico Turri
|
1fbdf7bdaa
|
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
|
47c39f51e5
|
Handling of gizmos related key events moved into new method GLGizmosManager::on_key()
|
2019-03-26 14:38:30 +01:00 |
|
Enrico Turri
|
52f11a6f0d
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
|
2019-03-26 14:08:46 +01:00 |
|
Enrico Turri
|
d18208458b
|
Handling of gizmos related char events moved into new method GLGizmosManager::on_char()
|
2019-03-26 14:08:02 +01:00 |
|
bubnikv
|
0a3500b5ab
|
Added tooltip [Ctrl - R] to the Slice now button
|
2019-03-26 14:00:53 +01:00 |
|
Enrico Turri
|
c1d74d2943
|
Code cleanup
|
2019-03-26 12:39:40 +01:00 |
|
Enrico Turri
|
eafdcb04ba
|
Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse()
|
2019-03-26 12:30:17 +01:00 |
|
tamasmeszaros
|
a49643ebdb
|
Merging with master, solving conflicts.
|
2019-03-26 11:13:28 +01:00 |
|
tamasmeszaros
|
57e28b53f2
|
Further refactor and simplification of slice index and print data.
|
2019-03-26 10:57:45 +01:00 |
|
bubnikv
|
82321c7aee
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r
|
2019-03-26 10:39:08 +01:00 |
|
bubnikv
|
e0e1e2b682
|
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
|
910979cf73
|
Fixed crash after change of a language
+ Updating of a mode after recreation
|
2019-03-26 10:09:53 +01:00 |
|
Enrico Turri
|
a09197879d
|
Code cleanup
|
2019-03-26 09:10:35 +01:00 |
|
Enrico Turri
|
3818bfa19a
|
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
|
b4ea43a6b0
|
Merge branch 'master' into tm_slice_index_lyrh
|
2019-03-25 19:02:35 +01:00 |
|
tamasmeszaros
|
d73d9309f1
|
Refactoring and commenting slice index solution.
|
2019-03-25 19:02:05 +01:00 |
|
Sijmen Schoon
|
1ed7895f61
|
Merge branch 'master' into fix-assertions
|
2019-03-25 17:24:04 +01:00 |
|
Enrico Turri
|
3e0ec8098b
|
Code cleanup
|
2019-03-25 14:13:20 +01:00 |
|
Enrico Turri
|
ead45c4fb2
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
|
2019-03-25 14:12:40 +01:00 |
|
Enrico Turri
|
149551946c
|
Fix of #1998
|
2019-03-25 12:07:43 +01:00 |
|
Enrico Turri
|
dd3ac4017a
|
Yet another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse()
|
2019-03-25 08:48:41 +01:00 |
|
Enrico Turri
|
03aeb0d386
|
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
|
2019-03-25 08:32:05 +01:00 |
|
Lukas Matena
|
3f7f8f978e
|
Fix of sla gizmo (it sometimes showed supports for hidden objects)
|
2019-03-24 13:35:09 +01:00 |
|