diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-29 20:25:20 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-29 20:25:20 +0400 |
commit | b818016d77d4669cb45a57666286c2e60d8d062a (patch) | |
tree | 976004a3b940005004f360430c79cf4044a5a732 /source/gameengine/Rasterizer/RAS_MaterialBucket.h | |
parent | c23532715281f7e14d750f019919b247920cdb50 (diff) |
Apricot Branch
==============
svn merge -r15866:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Alpha blending and sorting changes, but also include some initial
support for GLSL lamps in dupligroups (only one duplicate works at
the moment).
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_MaterialBucket.h')
-rw-r--r-- | source/gameengine/Rasterizer/RAS_MaterialBucket.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h index 13d8a53714a..4eef889c533 100644 --- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h +++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h @@ -125,11 +125,9 @@ public: class RAS_IRasterizer* rasty, class RAS_IRenderTools* rendertools); - void SchedulePolygons(int drawingmode); - void ClearScheduledPolygons(); - RAS_IPolyMaterial* GetPolyMaterial() const; - bool IsTransparant() const; + bool IsAlpha() const; + bool IsZSort() const; static void StartFrame(); static void EndFrame(); @@ -162,7 +160,6 @@ public: private: T_MeshSlotList m_meshSlots; - bool m_bScheduled; bool m_bModified; RAS_IPolyMaterial* m_material; double* m_pOGLMatrix; |