diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-26 17:11:55 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-26 17:11:55 +0400 |
commit | b6569ee4e75de0a68d05278eee6fb10ecc3d7183 (patch) | |
tree | bd0304a2f9c387c4989901058848ffb9b534f0f0 /source/blender/freestyle | |
parent | 9bd9b7e958b86f4dda24d6d2af3bf42a751cd79a (diff) | |
parent | df22957bfce70b704b6b93958814c1ca8b2211f5 (diff) |
Merged changes in the trunk up to revision 42116.
Diffstat (limited to 'source/blender/freestyle')
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 01d416e46be..103255d28d1 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -78,8 +78,8 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count) freestyle_scene->r.gauss= old_scene->r.gauss; freestyle_scene->r.dither_intensity= old_scene->r.dither_intensity; BLI_strncpy(freestyle_scene->r.engine, old_scene->r.engine, sizeof(freestyle_scene->r.engine)); - freestyle_scene->r.planes = R_PLANES32; - freestyle_scene->r.imtype = R_PNG; + freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA; + freestyle_scene->r.im_format.imtype = R_IMF_IMTYPE_PNG; set_scene_bg( G.main, freestyle_scene ); // Camera diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp index e3f979fea8f..01567b18142 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.cpp +++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp @@ -58,21 +58,21 @@ PyObject * Vector_from_Vec2f( Vec2f& vec ) { float vec_data[2]; // because vec->_coord is protected vec_data[0] = vec.x(); vec_data[1] = vec.y(); - return newVectorObject( vec_data, 2, Py_NEW, NULL); + return Vector_CreatePyObject( vec_data, 2, Py_NEW, NULL); } PyObject * Vector_from_Vec3f( Vec3f& vec ) { float vec_data[3]; // because vec->_coord is protected vec_data[0] = vec.x(); vec_data[1] = vec.y(); vec_data[2] = vec.z(); - return newVectorObject( vec_data, 3, Py_NEW, NULL); + return Vector_CreatePyObject( vec_data, 3, Py_NEW, NULL); } PyObject * Vector_from_Vec3r( Vec3r& vec ) { float vec_data[3]; // because vec->_coord is protected vec_data[0] = vec.x(); vec_data[1] = vec.y(); vec_data[2] = vec.z(); - return newVectorObject( vec_data, 3, Py_NEW, NULL); + return Vector_CreatePyObject( vec_data, 3, Py_NEW, NULL); } PyObject * BPy_Id_from_Id( Id& id ) { 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" |