diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-08-03 18:46:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-08-03 18:46:34 +0400 |
| commit | 0253b73fcbad23708a9f88d760f051aafee489fd (patch) | |
| tree | 0694c76a250b2fa2c6bd0a368e4e300f30170abb /source/gameengine/Rasterizer | |
| parent | b818016d77d4669cb45a57666286c2e60d8d062a (diff) | |
apricot branch: svn merge -r15868:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Rasterizer')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_CameraData.h | 2 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_MeshObject.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/gameengine/Rasterizer/RAS_CameraData.h b/source/gameengine/Rasterizer/RAS_CameraData.h index 0327a3f4763..e3af43fb839 100644 --- a/source/gameengine/Rasterizer/RAS_CameraData.h +++ b/source/gameengine/Rasterizer/RAS_CameraData.h @@ -42,7 +42,7 @@ struct RAS_CameraData int m_viewporttop; float m_focallength; - RAS_CameraData(float lens = 35., float clipstart = 0.1, float clipend = 100., bool perspective = true, + RAS_CameraData(float lens = 35.0, float clipstart = 0.1, float clipend = 5000.0, bool perspective = true, float focallength = 0.0f, bool viewport = false, int viewportleft = 0, int viewportbottom = 0, int viewportright = 0, int viewporttop = 0) : m_lens(lens), diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index 9c0460aad2d..af5228e4c35 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -35,6 +35,8 @@ #include "MT_MinMax.h" #include "MT_Point3.h" +#include <algorithm> + STR_String RAS_MeshObject::s_emptyname = ""; @@ -674,7 +676,7 @@ void RAS_MeshObject::SortPolygons(const MT_Transform &transform) slots[j].get(vertexarray, indexarray, j*nvert, nvert, pnorm); /* sort (stable_sort might be better, if flickering happens?) */ - sort(slots.begin(), slots.end(), backtofront()); + std::sort(slots.begin(), slots.end(), backtofront()); /* get indices from temporary array again */ for(j=0; j<totpoly; j++) |