Revision: 48562
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48562
Author: campbellbarton
Date: 2012-07-03 21:03:39 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
fix error in node template and quiet warning.
Modified Paths:
--------------
trunk/blender/release/scripts/templates/operator_node.py
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c
Modified: trunk/blender/release/scripts/templates/operator_node.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_node.py 2012-07-03
19:40:01 UTC (rev 48561)
+++ trunk/blender/release/scripts/templates/operator_node.py 2012-07-03
21:03:39 UTC (rev 48562)
@@ -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
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2012-07-03
19:40:01 UTC (rev 48561)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2012-07-03
21:03:39 UTC (rev 48562)
@@ -3932,7 +3932,8 @@
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 @@
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);
Modified: trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c
2012-07-03 19:40:01 UTC (rev 48561)
+++ trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c
2012-07-03 21:03:39 UTC (rev 48562)
@@ -1640,7 +1640,7 @@
* sequence length */
static int Matrix_len(MatrixObject *self)
{
- return (self->num_row);
+ return self->num_row;
}
/*----------------------------object[]---------------------------
* sequence accessor (get)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
