archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 46045.

Browse Source 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
This commit is contained in:
Tamito Kajiyama
2012-04-29 00:59:04 +00:00
parent d8e12e8710 4465d2f419
commit 2585d52405
656 changed files with 33812 additions and 31804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/intern/bpy.c
View File

@@ -197,7 +197,7 @@ static PyObject *bpy_resource_path(PyObject *UNUSED(self), PyObject *args, PyObj
return NULL;
/* stupid string compare */
if (!strcmp(type, "USER")) folder_id = BLENDER_RESOURCE_PATH_USER;
if (!strcmp(type, "USER")) folder_id = BLENDER_RESOURCE_PATH_USER;
else if (!strcmp(type, "LOCAL")) folder_id = BLENDER_RESOURCE_PATH_LOCAL;
else if (!strcmp(type, "SYSTEM")) folder_id = BLENDER_RESOURCE_PATH_SYSTEM;
else {