Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-18 04:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task

Browse source 
(cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)
This commit is contained in:
Vladyslav Stelmakhovskyi 2017-04-01 20:33:46 +02:00
parent 7318ec468b
commit 990e1379e3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/Audio.qml
View file

@ -127,7 +127,7 @@ Rectangle {
text: hifi.glyphs.mic
color: hifi.colors.primaryHighlight
anchors.verticalCenter: parent.verticalCenter
font.pointSize: 27
size: 32
}
RalewayRegular {
anchors.verticalCenter: parent.verticalCenter
@ -182,7 +182,7 @@ Rectangle {
text: hifi.glyphs.unmuted
color: hifi.colors.primaryHighlight
anchors.verticalCenter: parent.verticalCenter
font.pointSize: 27
size: 32
}
RalewayRegular {
anchors.verticalCenter: parent.verticalCenter

2
libraries/gl/src/gl/OffscreenGLCanvas.cpp
View file

@ -59,7 +59,7 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
bool OffscreenGLCanvas::makeCurrent() {
bool result = _context->makeCurrent(_offscreenSurface);
//Q_ASSERT(result);
Q_ASSERT(result);
std::call_once(_reportOnce, [this]{
qCDebug(glLogging) << "GL Version: " << QString((const char*) glGetString(GL_VERSION));