diff options
Diffstat (limited to 'source/blender/blenkernel/intern/CCGSubSurf.c')
| -rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index e035d5cbb68..c572b1dacf0 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -32,8 +32,6 @@ #include "CCGSubSurf.h" #include "CCGSubSurf_intern.h" -#include "GPU_glew.h" - /***/ int BKE_ccg_gridsize(int level) @@ -715,8 +713,8 @@ CCGError ccgSubSurf_syncFace( if (f) { if (f->numVerts != numVerts || - memcmp(FACE_getVerts(f), ss->tempVerts, sizeof(*ss->tempVerts) * numVerts) || - memcmp(FACE_getEdges(f), ss->tempEdges, sizeof(*ss->tempEdges) * numVerts)) { + memcmp(FACE_getVerts(f), ss->tempVerts, sizeof(*ss->tempVerts) * numVerts) != 0 || + memcmp(FACE_getEdges(f), ss->tempEdges, sizeof(*ss->tempEdges) * numVerts) != 0) { topologyChanged = 1; } } @@ -786,8 +784,8 @@ CCGError ccgSubSurf_syncFace( if (f) { if (f->numVerts != numVerts || - memcmp(FACE_getVerts(f), ss->tempVerts, sizeof(*ss->tempVerts) * numVerts) || - memcmp(FACE_getEdges(f), ss->tempEdges, sizeof(*ss->tempEdges) * numVerts)) { + memcmp(FACE_getVerts(f), ss->tempVerts, sizeof(*ss->tempVerts) * numVerts) != 0 || + memcmp(FACE_getEdges(f), ss->tempEdges, sizeof(*ss->tempEdges) * numVerts) != 0) { topologyChanged = 1; } } @@ -1545,7 +1543,7 @@ void CCG_key(CCGKey *key, const CCGSubSurf *ss, int level) /* if normals are present, always the last three floats of an * element */ if (key->has_normals) { - key->normal_offset = key->elem_size - sizeof(float) * 3; + key->normal_offset = key->elem_size - sizeof(float[3]); } else { key->normal_offset = -1; |