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

svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Browse Source
This commit is contained in:
Campbell Barton
2011-05-24 04:35:21 +00:00
parent 94b8a81c17 1e00590f1c
commit 671cb93f1b
70 changed files with 540 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/python/generic/mathutils_Matrix.c
View File

@@ -132,12 +132,12 @@ static PyObject *Matrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
const unsigned short row_size= PySequence_Size(arg); /* -1 is an error, size checks will accunt for this */
if(IN_RANGE_INCL(row_size, 2, 4)) {
if(row_size >= 2 && row_size <= 4) {
PyObject *item= PySequence_GetItem(arg, 0);
const unsigned short col_size= PySequence_Size(item);
Py_XDECREF(item);
if(IN_RANGE_INCL(col_size, 2, 4)) {
if(col_size >= 2 && col_size <= 4) {
/* sane row & col size, new matrix and assign as slice */
PyObject *matrix= newMatrixObject(NULL, row_size, col_size, Py_NEW, type);
if(Matrix_ass_slice((MatrixObject *)matrix, 0, INT_MAX, arg) == 0) {

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

@@ -77,9 +77,9 @@ static PyObject *bpy_script_paths(PyObject *UNUSED(self))
PyObject *ret= PyTuple_New(2);
char *path;
path= BLI_get_folder(BLENDER_USER_SCRIPTS, NULL);
PyTuple_SET_ITEM(ret, 0, PyUnicode_FromString(path?path:""));
path= BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, NULL);
PyTuple_SET_ITEM(ret, 0, PyUnicode_FromString(path?path:""));
path= BLI_get_folder(BLENDER_USER_SCRIPTS, NULL);
PyTuple_SET_ITEM(ret, 1, PyUnicode_FromString(path?path:""));
return ret;