Fixed conflicts after cherry-picking 844e99f84e

This commit is contained in:
Enrico Turri committed 2019-05-24 14:42:46 +02:00
1 parent 9f3a05eef3
commit c92940c985
6 files changed
+118 -9

No files matched your search

+3
View File
@@ -46,4 +46,7 @@
#define ENABLE_SVG_ICONS (1 && ENABLE_1_42_0_ALPHA8 && ENABLE_TEXTURES_FROM_SVG)
// Enable scale object to fit print volume
#define ENABLE_SCALE_TO_FIT_PRINT_VOLUME 1
#endif // _technologies_h_