Revision: 22385
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22385
Author: campbellbarton
Date: 2009-08-11 21:20:31 +0200 (Tue, 11 Aug 2009)
Log Message:
-----------
- missing a decref for new pytypes
- remove needless strlen
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/unit.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/unit.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/unit.c
2009-08-11 19:08:41 UTC (rev 22384)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/unit.c
2009-08-11 19:20:31 UTC (rev 22385)
@@ -37,7 +37,7 @@
char *name_alt; /* alternative name */
double mul;
- double bias;
+ double bias; /* not used yet, needed for converting
temperature */
} bUnitDef;
/* define a single unit */
@@ -175,6 +175,7 @@
return i;
}
+
/* Used for drawing number buttons, try keep fast */
void bUnit_AsString(char *str, double value, int prec, int system, int type,
int split, int pad)
{
@@ -189,13 +190,12 @@
/* check the 2 is a smaller unit */
if(unit_b > unit_a) {
- i= unit_as_string(str, value_a, prec, usys, unit_a,
'\0');
- i= strlen(str);
+ i= unit_as_string(str, value_a, prec, usys, unit_a,
'\0');
str[i++]= ',';
str[i++]= ' ';
/* use low precision since this is a smaller unit */
- unit_as_string(str+i, value_b, prec?1:0, usys, unit_b,
'\0');
+ unit_as_string(str+i, value_b, prec?1:0, usys, unit_b,
'\0');
return;
}
}
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-08-11 19:08:41 UTC (rev 22384)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-08-11 19:20:31 UTC (rev 22385)
@@ -2371,6 +2371,7 @@
if (tp) {
pyrna = (BPy_StructRNA *) tp->tp_alloc(tp, 0);
+ Py_DECREF(tp);
}
else {
fprintf(stderr, "Could not make type\n");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
