Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2008-12-22 12:43:29 +0300
committerTon Roosendaal <ton@blender.org>2008-12-22 12:43:29 +0300
commit42def9a351a2c2696912288d9f1aed8b658f097c (patch)
treea7b41a8e8bd918e558695a74f311d722814b8ae3 /source/blender/editors/space_view3d/drawmesh.c
parent6d31872298e2f6fd23d06a4ccb792647879163ca (diff)
2.5
Cleanup - for portablity we can keep the old ugly defines for retrieving active object, cfra and so on. But, they will use 'scene' not G.scene. - fixed code that uses those defines. - some unused variables/functions removed
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
-rw-r--r--source/blender/editors/space_view3d/drawmesh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 58a9c126324..bbe89afd411 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -452,7 +452,7 @@ static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmoot
return 1;
}
-void draw_mesh_text(Object *ob, int glsl)
+void draw_mesh_text(Scene *scene, Object *ob, int glsl)
{
Mesh *me = ob->data;
DerivedMesh *ddm;
@@ -561,7 +561,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, Object *ob, DerivedMesh *dm,
/* draw game engine text hack */
if(get_ob_property(ob, "Text"))
- draw_mesh_text(ob, 0);
+ draw_mesh_text(scene, ob, 0);
draw_textured_end();