← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
9
9
class RAS_ListRasterizer;
10
10
class RAS_ListSlot : public KX_ListSlot
11
11
{
 
12
        friend class RAS_ListRasterizer;
12
13
        unsigned int m_list;
13
14
        unsigned int m_flag;
14
15
        RAS_ListRasterizer* m_rasty;
32
33
        LIST_NOCREATE   =8,
33
34
        LIST_BEGIN              =16,
34
35
        LIST_END                =32,
35
 
        LIST_REGEN              =64
 
36
        LIST_REGEN              =64,
 
37
        LIST_DERIVEDMESH=128,
36
38
};
37
39
 
38
 
typedef std::map<class RAS_MeshSlot*, RAS_ListSlot*> RAS_Lists;
 
40
struct DerivedMesh;
 
41
 
 
42
typedef std::map<RAS_DisplayArrayList, RAS_ListSlot*> RAS_ArrayLists;
 
43
typedef std::map<DerivedMesh*, RAS_ListSlot*>             RAS_DerivedMeshLists;
39
44
 
40
45
class RAS_ListRasterizer : public RAS_VAOpenGLRasterizer
41
46
{
42
47
        bool mUseVertexArrays;
43
 
        RAS_Lists mLists;
 
48
        bool mATI;
 
49
        RAS_ArrayLists mArrayLists;
 
50
        RAS_DerivedMeshLists mDerivedMeshLists;
44
51
 
45
52
        RAS_ListSlot* FindOrAdd(class RAS_MeshSlot& ms);
46
53
        void ReleaseAlloc();