diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
| commit | e91f33101ff0999e07f7ce941f31dca793d954e7 (patch) | |
| tree | 83c0d933f2ac1d063e2c57aaded58fd09d8d5712 /source/blender/python/intern/bpy.c | |
| parent | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (diff) | |
| parent | 818b2e81da7d5f3e04439e3b4fef5c7ce5263b5b (diff) | |
Merged changes in the trunk up to revision 50956.
Conflicts resolved:
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/python/intern/bpy.c')
| -rw-r--r-- | source/blender/python/intern/bpy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 360e041270f..529ad2782ab 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -173,7 +173,7 @@ static PyObject *bpy_user_resource(PyObject *UNUSED(self), PyObject *args, PyObj } PyDoc_STRVAR(bpy_resource_path_doc, -".. function:: resource_path(type, major=2, minor=57)\n" +".. function:: resource_path(type, major=bpy.app.version[0], minor=bpy.app.version[1])\n" "\n" " Return the base path for storing system files.\n" "\n" |