YuSanka
ba7b0839f2
Merge remote-tracking branch 'origin/master' into ys_cut
2022-02-28 13:36:10 +01:00
enricoturri1966
78a93acb5b
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat - SLA caps
2022-02-28 12:50:43 +01:00
enricoturri1966
d0511b332b
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat - Camera target
2022-02-28 12:39:00 +01:00
YuSanka
bf6abf71d0
Cut:
...
+ Code refactoring: grabbers to move cut plane by Axes are changed to one "plane grabber"
+ Code cleaning in GizmoMove3D: reverted changes from c45c0045
2022-02-28 12:06:56 +01:00
enricoturri1966
5b1c9a34d6
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat - Volumes picking pass
2022-02-28 12:05:08 +01:00
enricoturri1966
507dda6641
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat - Model sequential print clearance
2022-02-28 11:23:46 +01:00
enricoturri1966
b766902fe2
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat - Model non-manifold edges
2022-02-28 11:14:07 +01:00
enricoturri1966
df7be964e0
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat - Model sinking contour
2022-02-28 11:10:03 +01:00
Vojtech Bubnik
f71c242e53
Updated CGAL to the latest version.
2022-02-28 11:05:04 +01:00
enricoturri1966
a5ff37013b
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 1st installment.
...
Shader: flat - Default bed
2022-02-28 10:41:01 +01:00
enricoturri1966
2379588196
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Fix in GLGizmoRotate::render_angle_arc():
...
Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Fix in GLModel::render()
2022-02-28 10:21:03 +01:00
Nick Berardi
a1846e38d2
Reved Creality.ini version
...
Reved Creality.ini version, and included `*pauseprint*` for Ender-3 Max as well.
2022-02-27 10:37:08 -05:00
Nick Berardi
537fa118df
Added support for *pauseprint*
to Ender-3 models
...
Added support for `*pauseprint*` to Ender-3 models, as they do support `M25` out of the box from at least the Ender-3 line forward.
2022-02-27 10:32:58 -05:00
Nick Berardi
1ad8460a3c
creality.ini: add Ender-3 Pro
...
Added missing profile for Creality Ender-3 Pro
2022-02-27 10:04:26 -05:00
enricoturri1966
b4c11dfc83
SPE-1202 - Fixed project name after loading a 3mf file whose path contains diacritics by double clicking (might be a fix of #7681 , #7173 and #7845 )
2022-02-25 14:11:06 +01:00
Vojtech Bubnik
97fb6d22dd
Follow-up to 8aefe3fc90687aaa96a0f0fce59d073ad334eb75
...
Suppress the G-code find / replace substitutions for the non-G-code
sections (comment blocks) at the start and at the end of the G-code file.
This commit extends the suppressed blocks for G-code find / replace
to placeholders for initial / final M73 commands and over the trailing
G-code comments.
Fixes gcode substitution: replacing comments removes initial and final M73 commands
2022-02-25 12:20:33 +01:00
enricoturri1966
0abab29b6b
Tech ENABLE_WORLD_COORDINATE - ObjectManipulation::update_reset_buttons_visibility() changed logic for drop to bed button
2022-02-25 12:12:23 +01:00
enricoturri1966
7d971b15a3
Fixed conflicts after merge with master
2022-02-25 12:02:44 +01:00
Filip Sykala
8022c64209
Fix Retina coordinate for stored popup menu position
2022-02-25 11:58:15 +01:00
enricoturri1966
1e9951dec5
Follow-up of 5b5fdfba012aecb79429638d0ea514b060dea6a9 - Removed member variable Selection::m_dragging
...
It was used only in ObjectManipulation::update_if_dirty() to avoid the update the sidebar reset and mirror button, which results in a slow down of the GUI, while dragging objects/gizmos in the 3D scene
A call to GLCanvas3D::is_dragging() is used instead
2022-02-25 11:42:42 +01:00
enricoturri1966
071888c284
Port of 5b5fdfba012aecb79429638d0ea514b060dea6a9 into tech ENABLE_WORLD_COORDINATE_SCALE_REVISITED
2022-02-24 14:56:24 +01:00
enricoturri1966
d84853c732
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
2022-02-24 14:53:18 +01:00
enricoturri1966
5b5fdfba01
Follow-up of 3cd15ac005287f1d12aa63c6fb072fb8acc3170b - Fixed update of dragging state of selection
2022-02-24 14:49:53 +01:00
enricoturri1966
e4d053c760
Tech ENABLE_OBJECT_MANIPULATOR_FOCUS - Fixed kill focus handling for sidebar object manipulator fields
2022-02-24 14:09:43 +01:00
enricoturri1966
2aa79ec483
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements
2022-02-24 13:24:28 +01:00
enricoturri1966
a32c8b77eb
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
2022-02-24 13:21:15 +01:00
enricoturri1966
cd32254190
Fixed conflicts after merge with master
2022-02-24 13:17:30 +01:00
Lukas Matena
e058f794d9
Merge branch 'stable'
2022-02-24 13:05:05 +01:00
enricoturri1966
68dae1d166
Fixed conflicts after merge with master
2022-02-24 12:54:57 +01:00
Lukas Matena
54b2c67e75
Bumped up version to 2.4.1-beta3
version_2.4.1-beta3
2022-02-24 11:12:34 +01:00
Filip Sykala
3cd15ac005
Merge branch 'master' into fs_mouse
2022-02-23 16:25:44 +01:00
enricoturri1966
7150ef05cc
Tech ENABLE_WORLD_COORDINATE - Fixed rotation performed from sidebar manipulation fields
2022-02-23 15:51:56 +01:00
enricoturri1966
8ae6ccff08
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
2022-02-23 15:41:23 +01:00
enricoturri1966
b155d1a2c3
Follow-up of 1eac357739d44fcdcfbbb742b888b51ce8858bba - Fixed color of volumes after creation
2022-02-23 15:40:25 +01:00
enricoturri1966
99b45039a5
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
2022-02-23 14:59:58 +01:00
enricoturri1966
b4516396fe
SPE-1202 - Fixed project name after loading a 3mf file whose path contains diacritics by double clicking
2022-02-23 14:56:16 +01:00
Filip Sykala
0d48cf5ab9
Merge branch 'master' into fs_mouse
2022-02-23 14:43:42 +01:00
enricoturri1966
c78ee8f936
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2022-02-23 14:27:19 +01:00
enricoturri1966
148ed7fee4
Follow-up of 1eac357739d44fcdcfbbb742b888b51ce8858bba - Fixed warning
2022-02-23 14:27:10 +01:00
Filip Sykala
ca79932d30
Reduce test to use only STB calls
2022-02-23 13:55:27 +01:00
Lukas Matena
0a280be8d0
Placeholder parser fixes
2022-02-23 13:44:26 +01:00
enricoturri1966
3bdc6e49c1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2022-02-23 13:39:59 +01:00
enricoturri1966
1eac357739
Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel: GLVolume geometry + removed class GLIndexedVertexArray from codebase
2022-02-23 13:39:54 +01:00
Filip Sykala
482e510d7f
Add temporary test for win/mac
2022-02-23 13:29:26 +01:00
YuSanka
1b9f42d71b
Cut improvements:
...
* Added new cut() function witch respects to the rotation of the cut plane
* Added revert buttons to the GizmoCutDialog
* Fixed GLGizmoCenterMove::bounding_box(). Pad and supports don't added to the bb now
2022-02-23 13:24:06 +01:00
Lukas Matena
d3e7a9613e
Fix of cut gizmo: contour placed incorrectly with elevated objects
2022-02-23 11:01:02 +01:00
Lukáš Hejl
33fe1c44b4
Fixed 'illegal qualified name in member declaration' reported in #7959 .
2022-02-22 17:34:09 +01:00
Filip Sykala
24207403ea
Merge branch 'master' into fs_emboss
2022-02-22 13:51:04 +01:00
Filip Sykala
aabc0bf9b1
add mising include
2022-02-22 13:47:14 +01:00
Filip Sykala
284fd8ec8b
Remove reference in lambda call
2022-02-22 13:39:28 +01:00