Commit Graph

11041 Commits

Author SHA1 Message Date
YuSanka
a27026aa03 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-20 09:58:33 +02:00
YuSanka
8aaff08355 Added Possibility to create "shape" as an independent object from 3dScene,
using right click on empty place
2019-09-20 09:57:27 +02:00
Enrico Turri
9e09c52ab0 #2948 - Max zoom takes in account custom bed model size 2019-09-20 09:53:35 +02:00
bubnikv
110d5b9d56 Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev 2019-09-19 17:16:43 +02:00
bubnikv
6ce1011a09 Slic3r -> PrusaSlicer in config snapshot dialog. 2019-09-19 17:16:37 +02:00
YuSanka
e34ef1dd07 Merge remote-tracking branch 'origin/dev' into ys_manipulation_panel_rw 2019-09-19 15:39:13 +02:00
YuSanka
0b093160f5 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-19 15:29:11 +02:00
YuSanka
29f3c938e6 Fix of SPE-1026 (Height range value works differently if you press enter and if you leave textbox)
Related to GH #2946
2019-09-19 15:28:36 +02:00
bubnikv
bcdb75f799 Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev 2019-09-19 14:32:13 +02:00
bubnikv
2414dab85a Fix of perl bindings 2019-09-19 14:31:50 +02:00
YuSanka
381735581b Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-19 14:12:12 +02:00
YuSanka
ddf37d3b01 Fix under OSX for 584b37513f 2019-09-19 14:11:56 +02:00
Enrico Turri
0de8245432 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-19 14:03:05 +02:00
Enrico Turri
355a7d6a8c Fixed empty filename when trying to export a plate where no object is selected and no object is printable 2019-09-19 14:01:17 +02:00
Enrico Turri
74747226f7 ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Modified .zip.amf import/export to save/load volume matrices and source data

2) Incremented .zip.amf version to 3
2019-09-19 12:39:59 +02:00
YuSanka
91311fc0a0 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-19 12:30:35 +02:00
YuSanka
584b37513f Implemented possibility to create "shape" as an object (#2865) 2019-09-19 12:30:16 +02:00
bubnikv
80c5eaacdf Merge remote-tracking branch 'remotes/origin/dev' into vk-materials 2019-09-19 11:49:49 +02:00
Enrico Turri
3a40565d03 Added tech ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Reworked void Plater::priv::reload_from_disk() to be more general

2) Added source data to class ModelVolume

3) Modified .3mf import/export to save/load volume matrices and source data

4) Incremented .3mf version to 2
2019-09-19 09:09:11 +02:00
bubnikv
40e5fb5bb9 Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev 2019-09-19 08:57:04 +02:00
bubnikv
94212fa2a9 Another fix of admesh on big endian architectures, fixes #2879 2019-09-19 08:56:47 +02:00
YuSanka
67d7809418 Fixed font size and layouts for ObjectManipulation panel under OSX 2019-09-19 08:44:19 +02:00
Enrico Turri
a37ad3b552 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-19 08:33:59 +02:00
YuSanka
c9c407cc2b Rewrote UI for ObjectManipulation without using of OptionsGrope 2019-09-18 15:10:36 +02:00
Lukas Matena
76a657ce52 Plater.cpp - better added a range-check when selecting filament color in purging volumes dialog 2019-09-18 12:54:21 +02:00
Lukas Matena
741e98804c Purging volumes dialog now uses filament colour in case extruder color is undefined 2019-09-18 11:47:19 +02:00
Vojtech Kral
107ff6fd36 Materials: Cleanup 2019-09-17 17:16:15 +02:00
Vojtech Kral
cb1ee5ce55 ConfigWizard: Add view mode setting page 2019-09-17 15:52:26 +02:00
Enrico Turri
d2e8026a80 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 15:50:06 +02:00
Enrico Turri
cd7895065a Fixed typo 2019-09-17 15:48:39 +02:00
Enrico Turri
73f0b32abe Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 15:40:28 +02:00
Enrico Turri
f4910cafed Fixed selection after adding a modifier by loading it from file 2019-09-17 15:30:54 +02:00
Lukas Matena
dd7eb0b186 Merge branch 'lm_raycasting_refactoring' into dev 2019-09-17 14:59:14 +02:00
Lukas Matena
6bcafd7c83 SLA gizmo no more uses IGL code directly, all was moved to the new MeshRaycaster class 2019-09-17 14:57:57 +02:00
Lukas Matena
1dfd8a0e62 MeshRaycaster class is now used in SLA gizmo when selecting by rectangle 2019-09-17 14:57:54 +02:00
Lukas Matena
3694bf3da9 Added functions get_hit_pos, get_hit_normal, ready to implement intersect_ray 2019-09-17 14:57:49 +02:00
Lukas Matena
b6292247e8 Unproject on mesh in the SLA gizmo is now performed by the MeshRaycaster class 2019-09-17 14:57:45 +02:00
YuSanka
0890c1417a Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-17 13:42:06 +02:00
YuSanka
93aa5ac6ce Fixed re-scaling under MSW for Layers editing
+ Clean code in GUI_ObjectManipulation.cpp
2019-09-17 13:41:44 +02:00
Vojtech Kral
c5a67ff931 WIP: filament/material filtering per selected printers 2019-09-17 13:20:06 +02:00
Vojtech Kral
9a465514ff Filament and material default installation based on enabled printers 2019-09-17 13:20:06 +02:00
Vojtech Kral
270008a3fd Add material_type config option for SLA materials, use in Wizard 2019-09-17 13:20:06 +02:00
Vojtech Kral
235b659cf9 WIP: ConfigWizard: 3rd party bundle installation roughly done 2019-09-17 13:20:06 +02:00
Vojtech Kral
dba9925c4e Move ConfigWizard instance in GUI_App, lazy-initialized,
add filament/material installation item in Sidebar combo boxes
2019-09-17 13:20:06 +02:00
Vojtech Kral
87b7b1cc1d Load default filament/material selections from vendor profiles 2019-09-17 13:20:06 +02:00
Vojtech Kral
34b3548102 Filaments and materials selection/installation 2019-09-17 13:20:06 +02:00
Enrico Turri
b8cf0db209 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 12:54:46 +02:00
Enrico Turri
a93e63e296 Fixed object shifted after saving to/reloading from .3mf and .zip.amf a multivolume object with printable parts moved by user 2019-09-17 12:50:54 +02:00
Enrico Turri
5ae2a39e2f Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 08:19:57 +02:00
Enrico Turri
1624b634dd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 08:18:20 +02:00