svn merge -r 31145:31210 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2010-08-10 09:47:57 +00:00
parent d9272cdc20 c0e39df6ac
commit 46cac18815
299 changed files with 6223 additions and 6623 deletions
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -70,7 +70,7 @@ PyObject *bpy_script_paths(PyObject *self)
 static char bpy_blend_paths_doc[] =
 ".. function:: blend_paths(absolute=False)\n"
 "\n"
-"   Returns a list of paths associated with this blend file.\n"
+"   Returns a list of paths to external files referenced by the loaded .blend file.\n"
 "\n"
 "   :arg absolute: When true the paths returned are made absolute.\n"
 "   :type absolute: boolean\n"