merge with trunk/2.5 at r25907

2010-01-13 07:26:11 +00:00
parent ed12e1978f 3b1585b172
commit 219b472920
547 changed files with 28391 additions and 24175 deletions
--- a/source/blender/python/generic/quat.c
+++ b/source/blender/python/generic/quat.c
@@ -739,7 +739,7 @@ static PyGetSetDef Quaternion_getseters[] = {
 	 (getter)BaseMathObject_getWrapped, (setter)NULL,
 	 "True when this wraps blenders internal data",
 	 NULL},
-	{"__owner__",
+	{"_owner",
 	 (getter)BaseMathObject_getOwner, (setter)NULL,
 	 "Read only owner for vectors that depend on another object",
 	 NULL},