← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_FontObject.h

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_FontObject.h
42
42
        KX_FontObject(void* sgReplicationInfo,
43
43
                      SG_Callbacks callbacks,
44
44
                      RAS_IRenderTools* rendertools,
45
 
                      Object *ob);
 
45
                      Object *ob,
 
46
                                  bool do_color_management);
46
47
 
47
48
        virtual ~KX_FontObject();
48
49
 
69
70
 
70
71
        class RAS_IRenderTools* m_rendertools;  //needed for drawing routine
71
72
 
 
73
        bool            m_do_color_management;
 
74
 
72
75
#ifdef WITH_PYTHON
73
76
        static PyObject*        pyattr_get_text(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
74
77
        static int                      pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);