Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-11-26 17:11:55 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-11-26 17:11:55 +0400
commitb6569ee4e75de0a68d05278eee6fb10ecc3d7183 (patch)
treebd0304a2f9c387c4989901058848ffb9b534f0f0 /source/blender/freestyle/intern/python/BPy_Freestyle.cpp
parent9bd9b7e958b86f4dda24d6d2af3bf42a751cd79a (diff)
parentdf22957bfce70b704b6b93958814c1ca8b2211f5 (diff)
Merged changes in the trunk up to revision 42116.
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Freestyle.cpp')
-rw-r--r--source/blender/freestyle/intern/python/BPy_Freestyle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 36a49141fb9..9360201b035 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -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"