Fixed conflicts after merge with master

2026-07-31 11:15:52 +00:00 · 2019-05-24 15:29:22 +02:00
parent 302ac3a849 bf9740188a
commit efe29b3c2d
13 changed files with 1581 additions and 1934 deletions
@@ -52,7 +52,4 @@
 // Enable texture max size to be dependent on detected OpenGL version
 #define ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION 1

-// Enable scale object to fit print volume
-#define ENABLE_SCALE_TO_FIT_PRINT_VOLUME 1
-
 #endif // _technologies_h_