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/blender/makesrna/intern/rna_property.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/makesrna/intern/rna_property.c') diff --git a/source/blender/makesrna/intern/rna_property.c b/source/blender/makesrna/intern/rna_property.c index bf9f924489b..fc3697633a4 100644 --- a/source/blender/makesrna/intern/rna_property.c +++ b/source/blender/makesrna/intern/rna_property.c @@ -89,7 +89,7 @@ static void rna_GameProperty_type_set(PointerRNA *ptr, int value) if (prop->type != value) { prop->type = value; - init_property(prop); + BKE_bproperty_init(prop); } } @@ -97,7 +97,7 @@ static void rna_GameProperty_name_set(PointerRNA *ptr, const char *value) { bProperty *prop = (bProperty *)(ptr->data); BLI_strncpy_utf8(prop->name, value, sizeof(prop->name)); - unique_property(NULL, prop, 1); + BKE_bproperty_unique(NULL, prop, 1); } -- cgit v1.2.3