Merged changes in the trunk up to revision 30397.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 15 Jul 2010 21:05:11 +0000 (21:05 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 15 Jul 2010 21:05:11 +0000 (21:05 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blender/python/doc/sphinx_doc_gen.py
source/blender/python/intern/bpy.c
source/creator/CMakeLists.txt
source/creator/creator.c

index 4763f55593776ba93453e01ee43be86e080c0dfa,15be6174f29fc5ec40f1489528dccd56f2ddc0e5..4b54f5c6416a9bdd00cfbf1f979f0e50207c63a1
  #include "../generic/blf_api.h"
  #include "../generic/IDProp.h"
  
- static char bpy_home_paths_doc[] =
- ".. function:: home_paths(subfolder)\n"
 +#include "BPy_Freestyle.h"
 +
+ static char bpy_script_paths_doc[] =
+ ".. function:: script_paths()\n"
  "\n"
- "   Return 3 paths to blender home directories.\n"
+ "   Return 2 paths to blender scripts directories.\n"
  "\n"
- "   :arg subfolder: The name of a subfolder to find within the blenders home directory.\n"
- "   :type subfolder: string\n"
- "   :return: (system, local, user) strings will be empty when not found.\n"
+ "   :return: (system, user) strings will be empty when not found.\n"
  "   :rtype: tuple of strigs\n";
  
- PyObject *bpy_home_paths(PyObject *self, PyObject *args)
+ PyObject *bpy_script_paths(PyObject *self)
  {
-       PyObject *ret= PyTuple_New(3);
+       PyObject *ret= PyTuple_New(2);
        char *path;
-       char *subfolder= "";
      
-       if (!PyArg_ParseTuple(args, "|s:blender_homes", &subfolder))
-               return NULL;
-       path= BLI_gethome_folder(subfolder, BLI_GETHOME_SYSTEM);
+       path= BLI_get_folder(BLENDER_USER_SCRIPTS, NULL);
        PyTuple_SET_ITEM(ret, 0, PyUnicode_FromString(path?path:""));
-       path= BLI_gethome_folder(subfolder, BLI_GETHOME_LOCAL);
+       path= BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, NULL);
        PyTuple_SET_ITEM(ret, 1, PyUnicode_FromString(path?path:""));
-       path= BLI_gethome_folder(subfolder, BLI_GETHOME_USER);
-       PyTuple_SET_ITEM(ret, 2, PyUnicode_FromString(path?path:""));
      
        return ret;
  }
Simple merge
Simple merge