diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-18 08:35:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-18 08:35:30 +0400 |
| commit | d3737de8c284b7cb8e6bff4ee147561449fb2151 (patch) | |
| tree | 9379d0f4965cb4d274ab542451b193db7f3ee5c0 /source/blender/editors/space_view3d/drawobject.c | |
| parent | a4ff2b914049f3c7af6b06034f7a569b19ad8e7a (diff) | |
fix for a strange linking error where set_property() in source/blender/blenkernel/intern/property.c would get mixed up with an X11 function of the same name. it crashed blender loading on my system.
Give functions in property.c more unique names.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index a51ec15bd86..e88f49d4f5b 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3432,7 +3432,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW); dm->drawFacesGLSL(dm, GPU_enable_material); -// if (get_ob_property(ob, "Text")) +// if (BKE_bproperty_object_get(ob, "Text")) // XXX draw_mesh_text(ob, 1); GPU_disable_material(); |