sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

* free bullet-softbody was using free softbody function.

Browse Source 
* mistake from own changes to curves, new curves were being added with too low resolution.
* removed warnings I added recently
This commit is contained in:
Campbell Barton 2008-09-29 23:46:01 +00:00
parent a32d4280c9
commit 16b425b9c0
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/object.c
View File

@ -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_softbody(Object *ob)
void object_free_bulletsoftbody(Object *ob)
{
if(ob->bsoft) {
sbFree(ob->bsoft);
bsbFree(ob->bsoft);
ob->bsoft= NULL;
}
}

2
source/blender/python/api2_2x/Geometry.c
View File

@ -413,7 +413,7 @@ static void boxPack_ToPyObject(PyObject * value, boxPack **boxarray)
static PyObject *M_Geometry_BoxPack2D( PyObject * self, PyObject * boxlist )
{
boxPack *boxarray;
boxPack *boxarray = NULL;
float tot_width, tot_height;
int len;
int error;

3
source/blender/src/drawtext.c
View File

@ -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>
/***********************/ /*

4
source/blender/src/editcurve.c
View File

@ -4111,7 +4111,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
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 @@ Nurb *addNurbprim(int type, int stype, int newname)
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 @@ Nurb *addNurbprim(int type, int stype, int newname)
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");