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
Thomas Pitiot
CGoGN
Commits
b5fed18f
Commit
b5fed18f
authored
Nov 16, 2012
by
Kenneth Vanhoey
Browse files
Merge branch 'master' of cgogn:~/CGoGN
Conflicts: include/Algo/Import/import2tablesSurface.hpp
parents
40221907
adff367c
Changes
1
Hide whitespace changes
Inline
Side-by-side
include/Algo/Import/import2tablesSurface.hpp
View file @
b5fed18f
...
...
@@ -1074,7 +1074,11 @@ bool MeshTablesSurface<PFP>::importPlySLFgenericBin(const std::string& filename,
fp
.
read
((
char
*
)
properties
,
nbProps
*
propSize
)
;
// positions
<<<<<<<
HEAD
if
(
nbProps
>
2
)
=======
if
(
nbprops
>
2
)
>>>>>>>
adff367c4314a32954fe9d4bd8e1629e7efa8be2
positions
[
id
]
=
VEC3
(
properties
[
0
],
properties
[
1
],
properties
[
2
])
;
// position
if
(
tangent
&&
binormal
&&
normal
)
// == if (nbprops > 11)
...
...
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