[Bf-blender-cvs] [08eabd1] blender-v2.73-release: Fix own error in freestyle api
Campbell Barton
noreply at git.blender.org
Tue Jan 20 10:23:43 CET 2015
Commit: 08eabd199718ec881fe4f774ec618d1f92ab3ffb
Author: Campbell Barton
Date: Fri Jan 16 14:31:51 2015 +1100
Branches: blender-v2.73-release
https://developer.blender.org/rB08eabd199718ec881fe4f774ec618d1f92ab3ffb
Fix own error in freestyle api
Conflicts:
source/blender/freestyle/intern/python/BPy_ViewShape.cpp
===================================================================
M source/blender/freestyle/intern/python/BPy_ViewShape.cpp
===================================================================
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
index 1007320..8aaddbe 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
@@ -220,7 +220,6 @@ static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void *UNUSED(closur
static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure))
{
- PyObject *list = 0;
PyObject *item;
vector< ViewVertex *> v;
@@ -228,8 +227,10 @@ static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void *UN
PyErr_SetString(PyExc_TypeError, "value must be a list of ViewVertex objects");
return -1;
}
- for (int i = 0; i < PyList_Size(list); i++) {
- item = PyList_GetItem(list, i);
+
+ v.reserve(PyList_Size(value));
+ for (unsigned int i = 0; i < PyList_Size(value); i++) {
+ item = PyList_GET_ITEM(value, i);
if (BPy_ViewVertex_Check(item)) {
v.push_back(((BPy_ViewVertex *)item)->vv);
}
@@ -270,8 +271,10 @@ static int ViewShape_edges_set(BPy_ViewShape *self, PyObject *value, void *UNUSE
PyErr_SetString(PyExc_TypeError, "value must be a list of ViewEdge objects");
return -1;
}
+
+ v.reserve(PyList_Size(list));
for (int i = 0; i < PyList_Size(list); i++) {
- item = PyList_GetItem(list, i);
+ item = PyList_GET_ITEM(list, i);
if (BPy_ViewEdge_Check(item)) {
v.push_back(((BPy_ViewEdge *)item)->ve);
}
More information about the Bf-blender-cvs
mailing list