Commit Graph

18808 Commits

Author SHA1 Message Date
tamasmeszaros
63a23cf3f8 Use upstream expat, remove duplication in deps and src
Fix clash of builtin findEXPAT with config scripts
2022-03-02 09:58:46 +01:00
rtyr
b2fba940fe
Sync with PrusaSlicer-settings 2022-03-02 09:47:29 +01:00
Filip Sykala
4e97830c2b Fix of commit 4c416bc747
Separate escape characters of double quotted XML attribute value
2022-03-02 08:40:27 +01:00
enricoturri1966
5f9aeb1e38 Removed unneeded pairs glPushMatrix()/glPopMatrix() 2022-03-02 08:30:00 +01:00
Filip Sykala
fdf8ebed7f Fix of commit 95fc054590
Revert back previous deleted assert. It is usefull
2022-03-01 08:39:02 +01:00
Filip Sykala
3af58a27f3 Merge branch 'fs_emboss' of https://github.com/prusa3d/PrusaSlicer into fs_emboss 2022-02-28 18:33:03 +01:00
Filip Sykala
18d269506a add index of font inside of collection to FontProp(font property) + serialization/deserialization (3mf + appConfig)
separate glyph cache from FontFile
2022-02-28 18:32:50 +01:00
enricoturri1966
5377e4c43b Removed empty DoubleSliderUtils.hpp 2022-02-28 15:53:12 +01:00
Vojtech Bubnik
f71c242e53 Updated CGAL to the latest version. 2022-02-28 11:05:04 +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
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 5b5fdfba01 - 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 5b5fdfba01 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 3cd15ac005 - 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
a32c8b77eb Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-02-24 13:21:15 +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 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 1eac357739 - 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 1eac357739 - 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
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
Filip Sykala
212544d532 Fix rotation with object 2022-02-22 13:32:01 +01:00
Filip Sykala
f3f2dddcd1 Fix order of filling stored items 2022-02-22 13:13:21 +01:00
Filip Sykala
8f9887acdb Reduce amount of Undo/Redo snapshots 2022-02-22 12:43:29 +01:00
tamasmeszaros
4ed411f211 Fix tbb assert when grainsize is lower then 1 2022-02-22 12:43:06 +01:00
Lukáš Hejl
dbc3cfc004 Fixed an issue that, in some cases, an inner brim was not generated. 2022-02-22 12:39:10 +01:00
tamasmeszaros
d03b464dd3 Merge branch 'tm_pr7809' 2022-02-22 12:20:35 +01:00
tamasmeszaros
cc788ebb64 Fix and merge PR #7809 2022-02-22 11:36:27 +01:00
Yuri D'Elia
0ffcfd8393 Use namespaces to link against libcereal >= 1.3.1
Create an alias for previous versions.
2022-02-22 11:20:03 +01:00
Filip Sykala
6181b166a4 Add warning on to large and to small font which are not used in emboss text input 2022-02-22 09:56:47 +01:00