Commit dc85108c authored by Jan Möbius's avatar Jan Möbius
Browse files

More warnings fixed

parent dad2e0c4
Pipeline #3279 canceled with stage
in 39 minutes and 37 seconds
......@@ -1503,13 +1503,13 @@ void QtBaseViewer::actionDrawMenu( QAction * _action )
void QtBaseViewer::actionBackground()
{
const Vec4f bc = glstate_->clear_color() * 255.0;
const Vec4f bc = glstate_->clear_color() * 255.0f;
QColor backCol((int)bc[0], (int)bc[1], (int)bc[2]);
QColor c = QColorDialog::getColor(backCol,this);
if (c != backCol && c.isValid())
backgroundColor(Vec4f(((double) c.red()) / 255.0,
((double) c.green()) / 255.0,
((double) c.blue()) / 255.0,
backgroundColor(Vec4f(((double) c.red()) / 255.0f,
((double) c.green()) / 255.0f,
((double) c.blue()) / 255.0f,
1.0));
}
......
......@@ -383,7 +383,7 @@ private:
bool updateVertexPicking_;
/// Index of the first vertex in vertexpicking
unsigned int vertexPickingBaseIndex_;
size_t vertexPickingBaseIndex_;
/** @} */
......@@ -404,7 +404,7 @@ private:
bool updateEdgePicking_;
/// Index of the first edge in edgepicking
unsigned int edgePickingBaseIndex_;
size_t edgePickingBaseIndex_;
/** @} */
......@@ -425,7 +425,7 @@ private:
bool updateFacePicking_;
/// Index of the first face in facepicking
unsigned int facePickingBaseIndex_;
size_t facePickingBaseIndex_;
/** @} */
......@@ -446,7 +446,7 @@ private:
bool updateAnyPicking_;
/// Index of the first face in anypicking
unsigned int anyPickingBaseIndex_;
size_t anyPickingBaseIndex_;
/** @} */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment