Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
vite
Commits
3a97d7bb
Commit
3a97d7bb
authored
Dec 03, 2018
by
Mathieu Faverge
Browse files
Fix issue
#14
introduced by moving to more modern C++
parent
f96665f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/common/Session.cpp
View file @
3a97d7bb
...
...
@@ -307,8 +307,14 @@ Palette *Session::get_palette(const std::string &type, const std::string &palett
p
=
new
Palette
(
string
(
type
+
"/"
+
palette_name
));
*
where_from
=
p
;
#if defined(USE_QT5)
for
(
QMap
<
QString
,
QVariant
>::
const_iterator
it
=
qmap
.
cbegin
()
;
it
!=
qmap
.
cend
()
;
++
it
)
{
it
!=
qmap
.
cend
()
;
++
it
)
#else
for
(
QMap
<
QString
,
QVariant
>::
const_iterator
it
=
qmap
.
begin
()
;
it
!=
qmap
.
end
()
;
++
it
)
#endif
{
const
QColor
qc
=
it
.
value
().
value
<
QColor
>
();
Color
c
=
Color
(
qc
.
red
()
/
255.
,
qc
.
green
()
/
255.
,
qc
.
blue
()
/
255.
);
p
->
add_state
(
it
.
key
().
toStdString
(),
c
,
qc
.
alpha
()
==
255.
);
...
...
src/render/Shader.cpp
View file @
3a97d7bb
...
...
@@ -201,7 +201,7 @@ bool Shader::charger()
}
bool
Shader
::
compilerShader
(
GLuint
&
shader
,
GLenum
type
,
const
std
::
string
code
)
bool
Shader
::
compilerShader
(
GLuint
&
shader
,
GLenum
type
,
const
std
::
string
&
code
)
{
// Create shader
shader
=
glCreateShader
(
type
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment