From d3737de8c284b7cb8e6bff4ee147561449fb2151 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 18 Sep 2012 04:35:30 +0000 Subject: 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. --- source/gameengine/Converter/KX_ConvertProperties.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/gameengine') 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(object->data); -- cgit v1.2.3