← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_FontObject.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/Ketsji/KX_FontObject.h
39
39
{
40
40
public:
41
41
        Py_Header
42
 
        KX_FontObject(  void* sgReplicationInfo,
43
 
                                        SG_Callbacks callbacks,
44
 
                                        RAS_IRenderTools* rendertools,
45
 
                                        Object *ob);
 
42
        KX_FontObject(void* sgReplicationInfo,
 
43
                      SG_Callbacks callbacks,
 
44
                      RAS_IRenderTools* rendertools,
 
45
                      Object *ob);
46
46
 
47
47
        virtual ~KX_FontObject();
48
48
 
69
69
 
70
70
        class RAS_IRenderTools* m_rendertools;  //needed for drawing routine
71
71
 
72
 
#if 0 // WHY COMMENTED? - campbell
73
 
#ifdef WITH_CXX_GUARDEDALLOC
74
 
public:
75
 
        void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_FontObject"); }
76
 
        void operator delete( void *mem ) { MEM_freeN(mem); }
77
 
#endif
78
 
#endif
79
 
 
80
72
#ifdef WITH_PYTHON
81
73
        static PyObject*        pyattr_get_text(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
82
74
        static int                      pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
84
76
 
85
77
};
86
78
 
87
 
#endif //__KX_FONTOBJECT_H__
 
79
#endif  /* __KX_FONTOBJECT_H__ */