diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-04 01:03:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-04 01:03:39 +0400 |
| commit | 81a509fa409091f65cad4e8ac2a31fcb486ca2c3 (patch) | |
| tree | 254279c27b6436661991d32044fa790214534c17 | |
| parent | 468ef74ed74d2173a06d94b2f571b32c5b77cb2d (diff) | |
fix error in node template and quiet warning.
| -rw-r--r-- | release/scripts/templates/operator_node.py | 2 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 5 | ||||
| -rw-r--r-- | source/blender/python/mathutils/mathutils_Matrix.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/templates/operator_node.py b/release/scripts/templates/operator_node.py index 9c19993a38a..b689ce7634e 100644 --- a/release/scripts/templates/operator_node.py +++ b/release/scripts/templates/operator_node.py @@ -1,7 +1,7 @@ import bpy -def main(operator, context): +def main(context): space = context.space_data node_tree = space.node_tree node_active = context.active_node diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 3089d891541..e8a71a35576 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -3932,7 +3932,8 @@ static int make_segment_exec(bContext *C, wmOperator *op) ListBase *nubase = object_editcurve_get(obedit); Nurb *nu, *nu1 = NULL, *nu2 = NULL; BPoint *bp; - int a, ok = 0; + int ok = 0; + /* int a; */ /* UNUSED */ /* first decide if this is a surface merge! */ if (obedit->type == OB_SURF) nu = nubase->first; @@ -4040,7 +4041,7 @@ static int make_segment_exec(bContext *C, wmOperator *op) MEM_freeN(nu1->bp); nu1->bp = bp; - a = nu1->pntsu + nu1->orderu; + /* a = nu1->pntsu + nu1->orderu; */ /* UNUSED */ nu1->pntsu += nu2->pntsu; BLI_remlink(nubase, nu2); diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index 5c4c6414f39..5f372abcc69 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -1640,7 +1640,7 @@ static PyObject *Matrix_richcmpr(PyObject *a, PyObject *b, int op) * sequence length */ static int Matrix_len(MatrixObject *self) { - return (self->num_row); + return self->num_row; } /*----------------------------object[]--------------------------- * sequence accessor (get) |