Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1050)

Unified Diff: source/gameengine/Ketsji/KX_FontObject.h

Issue 4961053: Blender Cucumber to Trunk Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Fixes to crashing DDS mipmaps, leaking dyn lights, and some review comments. Created 12 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: source/gameengine/Ketsji/KX_FontObject.h
===================================================================
--- source/gameengine/Ketsji/KX_FontObject.h (revision 40024)
+++ source/gameengine/Ketsji/KX_FontObject.h (working copy)
@@ -59,13 +59,15 @@
virtual void ProcessReplica();
protected:
- STR_String m_text;
+ std::vector<STR_String> m_text;
Object* m_object;
int m_fontid;
int m_dpi;
float m_fsize;
float m_resolution;
float m_color[4];
+ float m_line_spacing;
+ MT_Vector3 m_offset;
class RAS_IRenderTools* m_rendertools; //needed for drawing routine
@@ -78,6 +80,8 @@
*/
#ifdef WITH_PYTHON
+ static PyObject* pyattr_get_text(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+ static int pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
#endif
};

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b