Skip to content

fixes clang 21.1.8 warnings #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LowLevelMahn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixes clang 21.1.8 warnings #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion src/app/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ Materials Settings::getMaterials()
QStringList colors = value(PATH_MATERIALS_COLORS).toStringList();
QStringList patterns = value(PATH_MATERIALS_PATTERNS).toStringList();

if (colors.empty() | patterns.empty()) {
if (colors.empty() || patterns.empty()) {
return restoreMaterials();
}

Expand Down
1 change: 0 additions & 1 deletion src/shape/shapeview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ void ShapeView::draw(bool pick)
MaterialsList* materialsList = primitive.materialsModel->materialsList();

int material = materialsList->at(m_currentPaintJob);
QColor color;

bool selected = false, pattern = false;

Expand Down
12 changes: 6 additions & 6 deletions src/shape/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
#include <QList>
#include <QVector3D>

typedef struct {
struct Vertex{
qint16 x;
qint16 y;
qint16 z;

inline QVector3D toQ() const { return QVector3D(x, y, z); }
} Vertex;
};

typedef QList<Vertex> VerticesList;

typedef struct {
struct VertexF{
float x;
float y;
float z;

inline QVector3D toQ() const { return QVector3D(x, y, z); }
} VertexF;
};

typedef QList<VertexF> VerticesFList;

Expand All @@ -29,14 +29,14 @@ typedef QList<quint8> MaterialsList;

class MaterialsModel;

typedef struct {
struct Primitive{
quint8 type;
bool twoSided;
bool zBias;
VerticesModel* verticesModel;
MaterialsModel* materialsModel;
quint32 cull1;
quint32 cull2;
} Primitive;
};

typedef QList<Primitive> PrimitivesList;