diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-11 06:18:27 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-11 06:18:27 +0400 |
commit | a0ae47f06c6232a91202bd06ea173b955735596b (patch) | |
tree | d0c928e2167037eec5f01277ebe7dc0885168d59 /source/gameengine | |
parent | 652f64762c31bd1cfcac7ae05f184b70713b2034 (diff) |
add some missing NULL checks, a few parts of the code used a pointer then checked it for NULL after.
also made it more clear that some areas assume the pointer isnt null (remove redundant NULL checks).
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Rasterizer/RAS_MeshObject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index 7da0be3a506..25afefbcc5a 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -536,18 +536,18 @@ void RAS_MeshObject::SortPolygons(RAS_MeshSlot& ms, const MT_Transform &transfor const MT_Vector3 pnorm(transform.getBasis()[2]); // unneeded: const MT_Scalar pval = transform.getOrigin()[2]; - vector<polygonSlot> slots(totpoly); + vector<polygonSlot> poly_slots(totpoly); /* get indices and z into temporary array */ for (j=0; j<totpoly; j++) - slots[j].get(it.vertex, it.index, j*nvert, nvert, pnorm); + poly_slots[j].get(it.vertex, it.index, j*nvert, nvert, pnorm); /* sort (stable_sort might be better, if flickering happens?) */ - std::sort(slots.begin(), slots.end(), backtofront()); + std::sort(poly_slots.begin(), poly_slots.end(), backtofront()); /* get indices from temporary array again */ for (j=0; j<totpoly; j++) - slots[j].set(it.index, j*nvert, nvert); + poly_slots[j].set(it.index, j*nvert, nvert); } } |