← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/Rasterizer/RAS_MeshObject.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Rasterizer/RAS_MeshObject.h
32
32
#ifndef __RAS_MESHOBJECT_H__
33
33
#define __RAS_MESHOBJECT_H__
34
34
 
35
 
#if defined(WIN32) && !defined(FREE_WINDOWS)
36
 
// disable the STL warnings ("debug information length > 255")
37
 
#pragma warning (disable:4786)
 
35
#ifdef _MSC_VER
 
36
   /* disable the STL warnings ("debug information length > 255") */
 
37
#  pragma warning (disable:4786)
38
38
#endif
39
39
 
40
40
#include <vector>
57
57
class RAS_MeshObject
58
58
{
59
59
private:
60
 
        unsigned int                            m_debugcolor;
 
60
        /* unsigned int                         m_debugcolor; */ /* UNUSED */
61
61
 
62
62
        bool                                            m_bModified;
63
63
        bool                                            m_bMeshModified;
106
106
 
107
107
        /* modification state */
108
108
        bool                            MeshModified();
109
 
        void                            SetMeshModified(bool v){m_bMeshModified = v;}
 
109
        void                            SetMeshModified(bool v) { m_bMeshModified = v; }
110
110
 
111
111
        /* original blender mesh */
112
112
        Mesh*                           GetMesh() { return m_mesh; }
116
116
        virtual RAS_Polygon*    AddPolygon(RAS_MaterialBucket *bucket, int numverts);
117
117
        virtual void                    AddVertex(RAS_Polygon *poly, int i,
118
118
                                                        const MT_Point3& xyz,
119
 
                                                        const MT_Point2& uv,
120
 
                                                        const MT_Point2& uv2,
 
119
                                                        const MT_Point2 uvs[RAS_TexVert::MAX_UNIT],
121
120
                                                        const MT_Vector4& tangent,
122
121
                                                        const unsigned int rgbacolor,
123
122
                                                        const MT_Vector3& normal,
170
169
        };
171
170
 
172
171
        vector<vector<SharedVertex> >   m_sharedvertex_map;
173
 
        
174
 
        
 
172
 
 
173
 
175
174
#ifdef WITH_CXX_GUARDEDALLOC
176
 
public:
177
 
        void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshObject"); }
178
 
        void operator delete( void *mem ) { MEM_freeN(mem); }
 
175
        MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_MeshObject")
179
176
#endif
180
177
};
181
178
 
182
 
#endif //__RAS_MESHOBJECT_H__
183
 
 
 
179
#endif  /* __RAS_MESHOBJECT_H__ */