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

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-04-21 12:51:47 +00:00
parent 96b024333e
commit 6701933f5c
64 changed files with 121 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,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 {

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

@@ -101,7 +101,7 @@ void bpy_context_update(bContext *C)
/* don't do this from a non-main (e.g. render) thread, it can cause a race
condition on C->data.recursion. ideal solution would be to disable
context entirely from non-main threads, but that's more complicated */
if(!BLI_thread_is_main())
if (!BLI_thread_is_main())
return;
BPy_SetContext(C);