diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-26 22:53:26 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-26 22:53:26 +0400 |
| commit | db90946d82d32bead6252f8bdc86b9daa5f45f07 (patch) | |
| tree | d5b3f252d04334554d27aa8094f7669d230fce67 /source/blender/src/drawmesh.c | |
| parent | b542721f329304f2dc582436b3a5de92dc045956 (diff) | |
svn merge -r 16608:16749 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2008-jaguarandi
Diffstat (limited to 'source/blender/src/drawmesh.c')
| -rw-r--r-- | source/blender/src/drawmesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c index 8f22c704fd0..ba266fa8c29 100644 --- a/source/blender/src/drawmesh.c +++ b/source/blender/src/drawmesh.c @@ -467,7 +467,7 @@ void draw_mesh_text(Object *ob, int glsl) MFace *mf, *mface= me->mface; MTFace *tface= me->mtface; MCol *mcol= me->mcol; /* why does mcol exist? */ - bProperty *prop = get_property(ob, "Text"); + bProperty *prop = get_ob_property(ob, "Text"); GPUVertexAttribs gattribs; int a, totface= me->totface; @@ -568,7 +568,7 @@ void draw_mesh_textured(Object *ob, DerivedMesh *dm, int faceselect) dm->drawFacesTex(dm, draw_tface__set_draw); /* draw game engine text hack */ - if(get_property(ob, "Text")) + if(get_ob_property(ob, "Text")) draw_mesh_text(ob, 0); draw_textured_end(); |