Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
17d94c30
Commit
17d94c30
authored
Jul 19, 2011
by
Maire Nicolas
Browse files
Correction d'un conflit dans shaderPhong.cpp
parent
6ca39fbe
Changes
1
Show whitespace changes
Inline
Side-by-side
src/Utils/Shaders/shaderPhong.cpp
View file @
17d94c30
...
...
@@ -248,20 +248,12 @@ void ShaderPhong::restoreUniformsAttribs()
getLocations
();
bind
();
<<<<<<<
HEAD
=======
>>>>>>>
04
f3042b58ff23e91cb7277bd02643f6a7e846ce
sendParams
();
bindVA_VBO
(
"VertexPosition"
,
m_vboPos
);
bindVA_VBO
(
"VertexNormal"
,
m_vboNormal
);
if
(
m_vboColor
)
bindVA_VBO
(
"VertexColor"
,
m_vboColor
);
<<<<<<<
HEAD
=======
>>>>>>>
04
f3042b58ff23e91cb7277bd02643f6a7e846ce
unbind
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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