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

Freestyle: use mathutils_array_parse() instead of its own helper functions.

Browse Source 
Patch contribution by flokkievids (Folkert de Vries).  Thanks!
This commit is contained in:
Tamito Kajiyama
2014-06-24 22:48:15 +09:00
parent 252eaed483
commit 9563bde9a5
10 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
View File

@@ -525,8 +525,9 @@ static PyObject *StrokeAttribute_color_get(BPy_StrokeAttribute *self, void *UNUS
static int StrokeAttribute_color_set(BPy_StrokeAttribute *self, PyObject *value, void *UNUSED(closure))
{
float v[3];
if (!float_array_from_PyObject(value, v, 3)) {
PyErr_SetString(PyExc_ValueError, "value must be a 3-dimensional vector");
if (mathutils_array_parse(v, 3, 3, value,
"value must be a 3-dimensional vector") == -1)
{
return -1;
}
self->sa->setColor(v[0], v[1], v[2]);
@@ -549,8 +550,9 @@ static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void *
static int StrokeAttribute_thickness_set(BPy_StrokeAttribute *self, PyObject *value, void *UNUSED(closure))
{
float v[2];
if (!float_array_from_PyObject(value, v, 2)) {
PyErr_SetString(PyExc_ValueError, "value must be a 2-dimensional vector");
if (mathutils_array_parse(v, 2, 2, value,
"value must be a 2-dimensional vector") == -1)
{
return -1;
}
self->sa->setThickness(v[0], v[1]);