Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ jobs:
run: |
sudo cmake -S . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-DCMAKE_CXX_FLAGS="-g" -DCMAKE_C_FLAGS="-g" \
-DENABLE_STABLE_DIFFUSION=ON \

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Pin stable-diffusion.cpp before enabling it in deploy builds

Enabling -DENABLE_STABLE_DIFFUSION=ON here makes the release workflow pull stable-diffusion.cpp through FetchContent, and CMakeLists.txt:241-245 pins that dependency to GIT_TAG master. Because this code path was previously off in CI, the change makes Windows/Linux/macOS release builds non-reproducible: any upstream push can now break packaging or silently change shipped behavior without a corresponding change in this repo. Please pin a specific tag or commit before turning this on in deploy.yml.

Useful? React with 👍 / 👎.

-DASSIMP_DIR=/usr/local/lib/cmake/assimp-${{ env.ASSIMP_DIR_VERSION }} \
-DASSIMP_INCLUDE_DIR=/usr/local/include/assimp \
-DQt6_DIR=/home/runner/work/QtMeshEditor/Qt/${{ env.QT_VERSION }}/gcc_64/lib/cmake/Qt6 \
Expand Down Expand Up @@ -1206,6 +1207,7 @@ jobs:
sudo cmake -S . \
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-DCMAKE_CXX_FLAGS="-g" -DCMAKE_C_FLAGS="-g" \
-DENABLE_STABLE_DIFFUSION=ON \
-DCMAKE_OSX_ARCHITECTURES="$(uname -m)" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
-DASSIMP_DIR=/usr/local/lib/cmake/assimp-${{ env.ASSIMP_DIR_VERSION }} \
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.24.0)
cmake_policy(SET CMP0005 NEW)
cmake_policy(SET CMP0048 NEW) # manages project version

project(QtMeshEditor VERSION 2.15.0 LANGUAGES C CXX)
project(QtMeshEditor VERSION 2.15.1 LANGUAGES C CXX)
message(STATUS "Building QtMeshEditor version ${PROJECT_VERSION}")

set(QTMESHEDITOR_VERSION_STRING "\"${PROJECT_VERSION}\"")
Expand Down Expand Up @@ -241,7 +241,7 @@ if(ENABLE_STABLE_DIFFUSION)
FetchContent_Declare(
stable_diffusion_cpp
GIT_REPOSITORY https://github.com/leejet/stable-diffusion.cpp.git
GIT_TAG master
GIT_TAG 545fac4
GIT_SHALLOW TRUE
)

Expand Down
3 changes: 3 additions & 0 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ description: |
with AI assistance, and inspect skeletons and bone weights. Supports FBX,
glTF, OBJ, Collada, STL and more. Includes CLI for batch processing and
an MCP server for AI agent integration.

CLI: Run 'qtmesheditor.qtmesh' or create a shortcut with:
sudo snap alias qtmesheditor.qtmesh qtmesh
license: MIT
contact: https://github.com/fernandotonon/QtMeshEditor/issues
issues: https://github.com/fernandotonon/QtMeshEditor/issues
Expand Down
2 changes: 1 addition & 1 deletion src/OgreWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ void OgreWidget::initOgreWindow(void)
mCamera = std::make_unique<SpaceCamera>(this);

mViewport = mOgreWindow->addViewport( mCamera->getCamera() );
mViewport->setBackgroundColour( Ogre::ColourValue( 0.18f, 0.18f, 0.18f ) );
mViewport->setBackgroundColour( Ogre::ColourValue( 0.118f, 0.118f, 0.118f ) );
mViewport->setVisibilityMask(SCENE_VISIBILITY_FLAGS);
mViewport->setMaterialScheme(Ogre::MSN_SHADERGEN);

Expand Down
6 changes: 6 additions & 0 deletions src/ViewCube/ViewCubeController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ ViewCubeController* ViewCubeController::qmlInstance(QQmlEngine* engine, QJSEngin
void ViewCubeController::initWidget()
{
m_cubeWidget = new QQuickWidget();
#if defined(Q_OS_LINUX) || defined(Q_OS_WIN)
// On Linux/Windows, Qt::Tool stays on top of all app windows.
// Use Qt::SubWindow to avoid taskbar entry without staying on top.
m_cubeWidget->setWindowFlags(Qt::FramelessWindowHint | Qt::SubWindow);
#else
m_cubeWidget->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
#endif
m_cubeWidget->setAttribute(Qt::WA_TranslucentBackground);
m_cubeWidget->setClearColor(Qt::transparent);
m_cubeWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
Expand Down
6 changes: 5 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ int main(int argc, char *argv[])
}
for (int i = 1; i < argc; ++i) {
QString arg(argv[i]);
if (arg == "--cli") { cliMode = true; break; }
if (arg == "--cli" || arg == "--help" || arg == "-h" ||
arg == "--version" || arg == "-v") {
cliMode = true;
break;
}
}
if (!cliMode) {
for (int i = 1; i < argc; ++i) {
Expand Down
Loading