projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8856f7f
)
[F] Fixing checking rule
author
Alexandr Arutjunov
<smal.root@gmail.com>
Sat, 1 Oct 2016 23:28:06 +0000
(
02:28
+0300)
committer
Alexandr Arutjunov
<smal.root@gmail.com>
Sat, 1 Oct 2016 23:28:06 +0000
(
02:28
+0300)
code/StandardShapes.cpp
patch
|
blob
|
history
diff --git
a/code/StandardShapes.cpp
b/code/StandardShapes.cpp
index
943b739
..
8b0b323
100644
(file)
--- a/
code/StandardShapes.cpp
+++ b/
code/StandardShapes.cpp
@@
-121,8
+121,7
@@
void Subdivide(std::vector<aiVector3D>& positions)
aiMesh* StandardShapes::MakeMesh(const std::vector<aiVector3D>& positions,
unsigned int numIndices)
{
- if (positions.size() & numIndices || positions.empty() || !numIndices)
- return NULL;
+ if (positions.empty() || !numIndices) return NULL;
// Determine which kinds of primitives the mesh consists of
aiMesh* out = new aiMesh();