diff --git a/common/lc_blenderpreferences.cpp b/common/lc_blenderpreferences.cpp index 1d9687da..9674cf3f 100644 --- a/common/lc_blenderpreferences.cpp +++ b/common/lc_blenderpreferences.cpp @@ -1,5 +1,4 @@ -#include - +#include "lc_global.h" #include "lc_blenderpreferences.h" #include "lc_application.h" #include "lc_mainwindow.h" @@ -12,6 +11,9 @@ #include "lc_file.h" #include "lc_qutils.h" #include "project.h" +#include + +#ifndef LC_DISABLE_BLENDER #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) using Qt::SkipEmptyParts; @@ -3861,3 +3863,5 @@ bool lcBlenderPreferences::ExtractAddon(const QString FileName, QString& Result) return Ok; } + +#endif // !LC_DISABLE_BLENDER diff --git a/common/lc_blenderpreferences.h b/common/lc_blenderpreferences.h index 95250285..911bffcd 100644 --- a/common/lc_blenderpreferences.h +++ b/common/lc_blenderpreferences.h @@ -1,5 +1,7 @@ #pragma once +#ifndef LC_DISABLE_BLENDER + #define LC_UNIX_SHELL "/bin/sh" #define LC_WINDOWS_SHELL "cmd.exe" #define LC_BLENDER_ADDON_BLEND_FILE "leocad.blend" @@ -438,3 +440,5 @@ private: }; extern class lcBlenderPreferences* gAddonPreferences; + +#endif // !LC_DISABLE_BLENDER diff --git a/common/lc_global.h b/common/lc_global.h index 62fafe51..a6af6fa7 100644 --- a/common/lc_global.h +++ b/common/lc_global.h @@ -43,10 +43,6 @@ class QPrinter; #define QT_STRINGIFY(x) QT_STRINGIFY2(x) #endif -#ifdef QT_NO_PROCESS -#define LC_DISABLE_RENDER_DIALOG -#endif - #define LC_ARRAY_COUNT(x) ((sizeof(x)/sizeof(0[x])) / ((size_t)(!(sizeof(x) % sizeof(0[x]))))) #define LC_ARRAY_SIZE_CHECK(a,s) static_assert(LC_ARRAY_COUNT(a) == static_cast(s), QT_STRINGIFY(a) " size mismatch.") diff --git a/leocad.pro b/leocad.pro index 0a3722fc..d3d742f8 100644 --- a/leocad.pro +++ b/leocad.pro @@ -164,6 +164,11 @@ macx { DEFINES += LC_DISABLE_UPDATE_CHECK=1 } +ios { + DEFINES += LC_DISABLE_RENDER_DIALOG=1 + DEFINES += LC_DISABLE_BLENDER=1 +} + SOURCES += \ common/camera.cpp \ common/group.cpp \ diff --git a/qt/lc_qpreferencesdialog.cpp b/qt/lc_qpreferencesdialog.cpp index b099a998..99826ee5 100644 --- a/qt/lc_qpreferencesdialog.cpp +++ b/qt/lc_qpreferencesdialog.cpp @@ -426,6 +426,7 @@ void lcPreferencesDialog::PartsArchiveBrowseClicked() void lcPreferencesDialog::BlenderAddonSettingsButtonClicked() { +#ifndef LC_DISABLE_BLENDER int Width = 1280; int Height = 720; double Scale = 1.0f; @@ -435,10 +436,7 @@ void lcPreferencesDialog::BlenderAddonSettingsButtonClicked() Height, Scale, this); - - Q_UNUSED(Width) - Q_UNUSED(Height) - Q_UNUSED(Scale) +#endif // !LC_BLENDER_DISABLED } void lcPreferencesDialog::ColorConfigBrowseButtonClicked() diff --git a/qt/lc_renderdialog.h b/qt/lc_renderdialog.h index 5cf7fa59..73ed834a 100644 --- a/qt/lc_renderdialog.h +++ b/qt/lc_renderdialog.h @@ -1,5 +1,19 @@ #pragma once +enum class lcPOVRayRenderQuality +{ + Low, + Medium, + High +}; + +enum class lcRenderDialogMode +{ + RenderPOVRay, + RenderBlender, + OpenInBlender +}; + #ifndef LC_DISABLE_RENDER_DIALOG namespace Ui { @@ -43,20 +57,6 @@ protected: QImage mScaledImage; }; -enum class lcRenderDialogMode -{ - RenderPOVRay, - RenderBlender, - OpenInBlender -}; - -enum class lcPOVRayRenderQuality -{ - Low, - Medium, - High -}; - class lcRenderDialog : public QDialog { Q_OBJECT @@ -116,4 +116,15 @@ protected: Ui::lcRenderDialog* ui; }; +#else + +class lcRenderPreviewWidget : public QWidget +{ +public: + explicit lcRenderPreviewWidget(QWidget* Parent) + : QWidget(Parent) + { + } +}; + #endif // LC_DISABLE_RENDER_DIALOG