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.

1 files changed, 2 insertions, 2 deletions

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);
 }