Revision: 16836
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16836
Author: campbellbarton
Date: 2008-09-30 01:46:01 +0200 (Tue, 30 Sep 2008)
Log Message:
-----------
* free bullet-softbody was using free softbody function.
* mistake from own changes to curves, new curves were being added with too low
resolution.
* removed warnings I added recently
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/python/api2_2x/Geometry.c
trunk/blender/source/blender/src/drawtext.c
trunk/blender/source/blender/src/editcurve.c
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2008-09-29
23:33:27 UTC (rev 16835)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2008-09-29
23:46:01 UTC (rev 16836)
@@ -70,6 +70,7 @@
#include "BKE_armature.h"
#include "BKE_action.h"
+#include "BKE_bullet.h"
#include "BKE_colortools.h"
#include "BKE_deform.h"
#include "BKE_DerivedMesh.h"
@@ -182,7 +183,7 @@
void object_free_bulletsoftbody(Object *ob)
{
if(ob->bsoft) {
- sbFree(ob->bsoft);
+ bsbFree(ob->bsoft);
ob->bsoft= NULL;
}
}
Modified: trunk/blender/source/blender/python/api2_2x/Geometry.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Geometry.c 2008-09-29
23:33:27 UTC (rev 16835)
+++ trunk/blender/source/blender/python/api2_2x/Geometry.c 2008-09-29
23:46:01 UTC (rev 16836)
@@ -413,7 +413,7 @@
static PyObject *M_Geometry_BoxPack2D( PyObject * self, PyObject * boxlist )
{
- boxPack *boxarray;
+ boxPack *boxarray = NULL;
float tot_width, tot_height;
int len;
int error;
Modified: trunk/blender/source/blender/src/drawtext.c
===================================================================
--- trunk/blender/source/blender/src/drawtext.c 2008-09-29 23:33:27 UTC (rev
16835)
+++ trunk/blender/source/blender/src/drawtext.c 2008-09-29 23:46:01 UTC (rev
16836)
@@ -77,7 +77,8 @@
#include "mydevice.h"
#include "blendef.h"
#include "winlay.h"
-
+#include "PIL_time.h"
+#include <ctype.h> /* ispunct */
#include <sys/stat.h>
/***********************/ /*
Modified: trunk/blender/source/blender/src/editcurve.c
===================================================================
--- trunk/blender/source/blender/src/editcurve.c 2008-09-29 23:33:27 UTC
(rev 16835)
+++ trunk/blender/source/blender/src/editcurve.c 2008-09-29 23:46:01 UTC
(rev 16836)
@@ -4111,7 +4111,7 @@
Mat3One(imat);
cent[0]= cent[1]= cent[2]= 0.0;
}
-
+
if ELEM5(stype, 0, 1, 2, 4, 6) {
nu = (Nurb*)MEM_callocN(sizeof(Nurb), "addNurbprim");
nu->type= type;
@@ -4121,6 +4121,7 @@
switch(stype) {
case 0: /* curve */
+ nu->resolu= 12; /* set as 4 above */
if(newname) {
rename_id((ID *)G.obedit, "Curve");
rename_id((ID *)G.obedit->data, "Curve");
@@ -4228,6 +4229,7 @@
break;
case 1: /* circle */
+ nu->resolu= 12; /* set as 4 above */
if(newname) {
rename_id((ID *)G.obedit, "CurveCircle");
rename_id((ID *)G.obedit->data, "CurveCircle");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
