forked from bartvdbraak/blender
* 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
This commit is contained in:
parent
a32d4280c9
commit
16b425b9c0
@ -70,6 +70,7 @@
|
|||||||
|
|
||||||
#include "BKE_armature.h"
|
#include "BKE_armature.h"
|
||||||
#include "BKE_action.h"
|
#include "BKE_action.h"
|
||||||
|
#include "BKE_bullet.h"
|
||||||
#include "BKE_colortools.h"
|
#include "BKE_colortools.h"
|
||||||
#include "BKE_deform.h"
|
#include "BKE_deform.h"
|
||||||
#include "BKE_DerivedMesh.h"
|
#include "BKE_DerivedMesh.h"
|
||||||
@ -182,7 +183,7 @@ void object_free_softbody(Object *ob)
|
|||||||
void object_free_bulletsoftbody(Object *ob)
|
void object_free_bulletsoftbody(Object *ob)
|
||||||
{
|
{
|
||||||
if(ob->bsoft) {
|
if(ob->bsoft) {
|
||||||
sbFree(ob->bsoft);
|
bsbFree(ob->bsoft);
|
||||||
ob->bsoft= NULL;
|
ob->bsoft= NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -413,7 +413,7 @@ static void boxPack_ToPyObject(PyObject * value, boxPack **boxarray)
|
|||||||
|
|
||||||
static PyObject *M_Geometry_BoxPack2D( PyObject * self, PyObject * boxlist )
|
static PyObject *M_Geometry_BoxPack2D( PyObject * self, PyObject * boxlist )
|
||||||
{
|
{
|
||||||
boxPack *boxarray;
|
boxPack *boxarray = NULL;
|
||||||
float tot_width, tot_height;
|
float tot_width, tot_height;
|
||||||
int len;
|
int len;
|
||||||
int error;
|
int error;
|
||||||
|
@ -77,7 +77,8 @@
|
|||||||
#include "mydevice.h"
|
#include "mydevice.h"
|
||||||
#include "blendef.h"
|
#include "blendef.h"
|
||||||
#include "winlay.h"
|
#include "winlay.h"
|
||||||
|
#include "PIL_time.h"
|
||||||
|
#include <ctype.h> /* ispunct */
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
/***********************/ /*
|
/***********************/ /*
|
||||||
|
@ -4121,6 +4121,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
|
|||||||
|
|
||||||
switch(stype) {
|
switch(stype) {
|
||||||
case 0: /* curve */
|
case 0: /* curve */
|
||||||
|
nu->resolu= 12; /* set as 4 above */
|
||||||
if(newname) {
|
if(newname) {
|
||||||
rename_id((ID *)G.obedit, "Curve");
|
rename_id((ID *)G.obedit, "Curve");
|
||||||
rename_id((ID *)G.obedit->data, "Curve");
|
rename_id((ID *)G.obedit->data, "Curve");
|
||||||
@ -4228,6 +4229,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
case 1: /* circle */
|
case 1: /* circle */
|
||||||
|
nu->resolu= 12; /* set as 4 above */
|
||||||
if(newname) {
|
if(newname) {
|
||||||
rename_id((ID *)G.obedit, "CurveCircle");
|
rename_id((ID *)G.obedit, "CurveCircle");
|
||||||
rename_id((ID *)G.obedit->data, "CurveCircle");
|
rename_id((ID *)G.obedit->data, "CurveCircle");
|
||||||
|
Loading…
Reference in New Issue
Block a user