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/gameengine/Converter | |
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/gameengine/Converter')
-rw-r--r-- | source/gameengine/Converter/KX_ConvertProperties.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp index fc14c9d2176..a63f4c38fb6 100644 --- a/source/gameengine/Converter/KX_ConvertProperties.cpp +++ b/source/gameengine/Converter/KX_ConvertProperties.cpp @@ -177,7 +177,7 @@ void BL_ConvertTextProperty(Object* object, KX_FontObject* fontobj,SCA_TimeEvent { CValue* tprop = fontobj->GetProperty("Text"); if (!tprop) return; - bProperty* prop = get_ob_property(object, "Text"); + bProperty* prop = BKE_bproperty_object_get(object, "Text"); if (!prop) return; Curve *curve = static_cast<Curve *>(object->data); |