Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
29db0967
Commit
29db0967
authored
Apr 23, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixColorStackCompat' into 'master'
use glColor in compat mode for the colorStack See merge request
!84
parents
4fcf4968
d81cd1a4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
libs_required/ACG/GL/ColorStack.cc
libs_required/ACG/GL/ColorStack.cc
+2
-1
No files found.
libs_required/ACG/GL/ColorStack.cc
View file @
29db0967
...
...
@@ -242,7 +242,8 @@ bool ColorStack::Node::setIndex (size_t _idx) const
{
if
(
colorStartIdx_
&&
colorStartIdx_
+
_idx
<
colorEndIdx_
)
{
//glColor(translator_->index2color(colorStartIdx_ + _idx));
if
(
ACG
::
compatibilityProfile
())
//only change glColor in compat mode as shader pipeline
glColor
(
translator_
->
index2color
(
colorStartIdx_
+
_idx
));
//renderer on core profiles does not rely on glColor
return
true
;
}
return
false
;
...
...
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