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

Merged changes in the trunk up to revision 50956.

Browse Source 
Conflicts resolved:
source/blender/editors/interface/resources.c
This commit is contained in:
Tamito Kajiyama
2012-09-30 13:16:55 +00:00
parent a42ba82f63 818b2e81da
commit e91f33101f
223 changed files with 1601 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"

1
source/blender/python/intern/bpy_props.c
View File

@@ -360,6 +360,7 @@ static int py_long_as_int(PyObject *py_long, int *r_int)
#define BPY_PROPDEF_UPDATE_DOC \
" :arg update: function to be called when this value is modified,\n" \
" This function must take 2 values (self, context) and return None.\n" \
" *Warning* there are no safety checks to avoid infinite recursion.\n" \
" :type update: function\n" \
#if 0

6
source/blender/python/intern/bpy_rna.c
View File

@@ -2211,7 +2211,7 @@ static int pyrna_prop_collection_subscript_str_lib_pair_ptr(BPy_PropertyRNA *sel
return -1;
}
/* lib is either a valid poniter or NULL,
/* lib is either a valid pointer or NULL,
* either way can do direct comparison with id.lib */
RNA_PROP_BEGIN (&self->ptr, itemptr, self->prop)
@@ -2420,7 +2420,7 @@ static PyObject *pyrna_prop_collection_subscript(BPy_PropertyRNA *self, PyObject
/* only get the length for negative values */
Py_ssize_t len = (Py_ssize_t)RNA_property_collection_length(&self->ptr, self->prop);
if (start < 0) start += len;
if (stop < 0) start += len;
if (stop < 0) stop += len;
}
if (stop - start <= 0) {
@@ -2546,7 +2546,7 @@ static int pyrna_prop_collection_ass_subscript(BPy_PropertyRNA *self, PyObject *
/* only get the length for negative values */
Py_ssize_t len = (Py_ssize_t)RNA_property_collection_length(&self->ptr, self->prop);
if (start < 0) start += len;
if (stop < 0) start += len;
if (stop < 0) stop += len;
}
if (stop - start <= 0) {

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

@@ -37,7 +37,7 @@
#include "../generic/py_capi_utils.h"
static bContext* __py_context = NULL;
static bContext *__py_context = NULL;
bContext *BPy_GetContext(void) { return __py_context; }
void BPy_SetContext(bContext *C) { __py_context = C; }

2
source/blender/python/intern/gpu.h
View File

@@ -30,7 +30,7 @@
*/
/**
* Initalizes the gpu Python module.
* Initializes the gpu Python module.
*/
PyObject *GPU_initPython(void);