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

Merged changes in the trunk up to revision 42116.

Browse Source
This commit is contained in:
Tamito Kajiyama
2011-11-26 13:11:55 +00:00
parent 9bd9b7e958 df22957bfc
commit b6569ee4e7
267 changed files with 3952 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/freestyle/intern/python/BPy_Freestyle.cpp
View File

@@ -128,10 +128,10 @@ static PyObject *Freestyle_blendRamp( PyObject *self, PyObject *args )
a[0] = v1->x(); b[0] = v2->x();
a[1] = v1->y(); b[1] = v2->y();
a[2] = v1->z(); b[2] = v2->z();
ramp_blend(type, &a[0], &a[1], &a[2], fac, b);
ramp_blend(type, a, fac, b);
delete v1;
delete v2;
return newVectorObject( a, 3, Py_NEW, NULL);
return Vector_CreatePyObject( a, 3, Py_NEW, NULL);
error:
if (v1) delete v1;
@@ -170,7 +170,7 @@ static PyObject *Freestyle_evaluateColorRamp( PyObject *self, PyObject *args )
PyErr_SetString(PyExc_ValueError, "failed to evaluate the color ramp");
return NULL;
}
return newVectorObject( out, 4, Py_NEW, NULL);
return Vector_CreatePyObject( out, 4, Py_NEW, NULL);
}
#include "DNA_color_types.h"