diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
| commit | c371f49d9aaf2c9eca90329954fe217efb5cf3f6 (patch) | |
| tree | 142b9cb20d8b963f0cfd8a8fd4ee6437a47dafc4 /source/gameengine/Rasterizer | |
| parent | b55e996874c8b9a12b4a2a50f9d1993b5f921c57 (diff) | |
| parent | 7301f33b26ccae263d0bfdde5f82d98a70790fd5 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21908:22075
Diffstat (limited to 'source/gameengine/Rasterizer')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_MeshObject.cpp | 5 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_MeshObject.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index 0ae6ad9d7ea..0995d5acdd5 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -90,9 +90,8 @@ struct RAS_MeshObject::fronttoback STR_String RAS_MeshObject::s_emptyname = ""; -RAS_MeshObject::RAS_MeshObject(Mesh* mesh, int lightlayer) - : //m_lightlayer(lightlayer), - m_bModified(true), +RAS_MeshObject::RAS_MeshObject(Mesh* mesh) + : m_bModified(true), m_bMeshModified(true), m_mesh(mesh), m_bDeformed(false) diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h index bf9c0f7b682..f34546a8ff7 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.h +++ b/source/gameengine/Rasterizer/RAS_MeshObject.h @@ -55,7 +55,6 @@ class RAS_MeshObject { private: unsigned int m_debugcolor; - //int m_lightlayer; bool m_bModified; bool m_bMeshModified; @@ -77,7 +76,7 @@ protected: public: // for now, meshes need to be in a certain layer (to avoid sorting on lights in realtime) - RAS_MeshObject(Mesh* mesh, int lightlayer); + RAS_MeshObject(Mesh* mesh); virtual ~RAS_MeshObject(); |