Fixed conflicts after cherry-picking 844e99f84e

This commit is contained in:
Enrico Turri 2019-05-22 14:42:38 +02:00
parent 9f3a05eef3
commit c92940c985
6 changed files with 118 additions and 9 deletions

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_