[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11271] branches/2-44-stable/blender/ source/blender: branches/2-44-stable
Diego Borghetti (Plumiferos)
bdiego at gmail.com
Sat Jul 14 04:55:37 CEST 2007
Revision: 11271
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11271
Author: bdiego
Date: 2007-07-14 04:55:36 +0200 (Sat, 14 Jul 2007)
Log Message:
-----------
branches/2-44-stable
Merge from trunk:
revision 11241:11242
revision 11242:11243
revision 11244:11245
revision 11262:11263
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11241
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11242
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11244
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11262
Modified Paths:
--------------
branches/2-44-stable/blender/source/blender/python/api2_2x/Curve.c
branches/2-44-stable/blender/source/blender/python/api2_2x/Mesh.c
branches/2-44-stable/blender/source/blender/src/buttons_editing.c
Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Curve.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Curve.c 2007-07-13 23:49:39 UTC (rev 11270)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Curve.c 2007-07-14 02:55:36 UTC (rev 11271)
@@ -1,5 +1,6 @@
/*
* $Id$
+ *
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
@@ -846,7 +847,6 @@
int nurb_num; /* index of curve we append to */
PyObject *coord_args; /* coords for new point */
PyObject *retval = NULL;
- PyObject *valtuple;
Nurb *nurb = self->curve->nurb.first; /* first nurb in Curve */
/* fixme - need to malloc new Nurb */
@@ -870,10 +870,10 @@
}
/* rebuild our arg tuple for appendPointToNurb() */
- valtuple = Py_BuildValue( "(O)", coord_args );
+ //valtuple = Py_BuildValue( "(O)", coord_args );
- retval = CurNurb_appendPointToNurb( nurb, valtuple );
- Py_DECREF( valtuple );
+ retval = CurNurb_appendPointToNurb( nurb, coord_args );
+ // Py_DECREF( valtuple );
return retval;
}
Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Mesh.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Mesh.c 2007-07-13 23:49:39 UTC (rev 11270)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Mesh.c 2007-07-14 02:55:36 UTC (rev 11271)
@@ -2326,7 +2326,7 @@
{
MEdge *edge = MEdge_get_pointer( self );
int param = PyObject_IsTrue( value );
- Mesh *me;
+ Mesh *me = self->mesh;
if( !edge )
return -1;
@@ -2339,8 +2339,6 @@
return EXPP_ReturnIntError( PyExc_TypeError,
"expected True/False or 0/1" );
- me = self->mesh;
-
if( param ) {
edge->flag |= SELECT;
me->mvert[edge->v1].flag |= SELECT;
Modified: branches/2-44-stable/blender/source/blender/src/buttons_editing.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/buttons_editing.c 2007-07-13 23:49:39 UTC (rev 11270)
+++ branches/2-44-stable/blender/source/blender/src/buttons_editing.c 2007-07-14 02:55:36 UTC (rev 11271)
@@ -4385,10 +4385,10 @@
uiBlockBeginAlign(block);
uiDefBut(block, BUT, B_JOINTRIA, "Join Triangles", 10, -20, 120, 19, 0, 0, 0, 0, 0, "Convert selected triangles to Quads");
uiDefButF(block, NUM, B_DIFF, "Threshold", 130, -20, 195, 19, &G.scene->toolsettings->jointrilimit, 0.0, 1.0, 5, 0, "Conversion threshold for complex islands");
- uiDefButBitS(block, TOG, B_JOINTRIA_UV, 0, "Delimit UVs", 10, -40, 78, 19, &G.scene->toolsettings->editbutflag, 0,0,0,0, "Don't join pairs where UVs don't match");
- uiDefButBitS(block, TOG, B_JOINTRIA_VCOL, 0, "Delimit Vcol", 90, -40, 78, 19, &G.scene->toolsettings->editbutflag, 0,0,0,0, "Don't join pairs where Vcols don't match");
- uiDefButBitS(block, TOG, B_JOINTRIA_SHARP, 0, "Delimit Sharp", 170, -40, 78, 19, &G.scene->toolsettings->editbutflag, 0,0,0,0, "Don't join pairs where edge is sharp");
- uiDefButBitS(block, TOG, B_JOINTRIA_MAT, 0, "Delimit Mat", 250, -40, 74, 19, &G.scene->toolsettings->editbutflag, 0,0,0,0, "Don't join pairs where material doesn't match");
+ uiDefButBitS(block, TOG, B_JOINTRIA_UV, 0, "Delimit UVs", 10, -40, 78, 19, &G.scene->toolsettings->editbutflag, 0,0,0,0, "Join pairs only where UVs match");
+ uiDefButBitS(block, TOG, B_JOINTRIA_VCOL, 0, "Delimit Vcol", 90, -40, 78, 19, &G.scene->toolsettings->editbutflag, 0,0,0,0, "Join pairs only where Vcols match");
+ uiDefButBitS(block, TOG, B_JOINTRIA_SHARP, 0, "Delimit Sharp", 170, -40, 78, 19, &G.scene->toolsettings->editbutflag, 0,0,0,0, "Join pairs only where edge is not sharp");
+ uiDefButBitS(block, TOG, B_JOINTRIA_MAT, 0, "Delimit Mat", 250, -40, 74, 19, &G.scene->toolsettings->editbutflag, 0,0,0,0, "Join pairs only where material matches");
uiBlockEndAlign(block);
More information about the Bf-blender-cvs
mailing list