archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Removing some useless code, and fixed a few compiler warnings.

Browse Source
This commit is contained in:
Joshua Leung
2007-07-30 11:10:30 +00:00
parent 8b127a9bc1
commit 655fb548aa
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/constraint.c
View File

@@ -2547,24 +2547,13 @@ static void evaluate_constraint (bConstraint *constraint, float ownermat[][4], f
/* obtain target effect */ /* obtain target effect */
switch (data->from) { switch (data->from) {
case 2: /* scale */ case 2: /* scale */
{
Mat4ToSize(targetmat, dvec); Mat4ToSize(targetmat, dvec);
}
break; break;
case 1: /* rotation */ case 1: /* rotation */
{
/* copy, and reduce to smallest rotation distance */
Mat4ToEul(targetmat, dvec); Mat4ToEul(targetmat, dvec);
/* reduce rotation */
for (i=0; i<3; i++)
dvec[i]= fmod(dvec[i], M_PI*2);
}
break; break;
default: /* location */ default: /* location */
{ VecCopyf(dvec, targetmat[3]);
VECCOPY(dvec, targetmat[3]);
}
break; break;
} }

2
source/blender/blenlib/intern/arithb.c
View File

@@ -3305,7 +3305,7 @@ int point_in_tri_prism(float p[3], float v1[3], float v2[3], float v3[3])
/* point closest to v1 on line v2-v3 in 3D */ /* point closest to v1 on line v2-v3 in 3D */
void PclosestVL3Dfl(float *closest, float *v1, float *v2, float *v3) void PclosestVL3Dfl(float *closest, float *v1, float *v2, float *v3)
{ {
float lambda, cp[3], len; float lambda, cp[3];
lambda= lambda_cp_line_ex(v1, v2, v3, cp); lambda= lambda_cp_line_ex(v1, v2, v3, cp);

6
source/blender/python/api2_2x/Constraint.c
View File

@@ -440,7 +440,9 @@ static PyObject *Constraint_insertKey( BPy_Constraint * self, PyObject * value )
/******************************************************************************/ /******************************************************************************/
/* Constraint Space Conversion get/set procedures */ /* Constraint Space Conversion get/set procedures */
/* - Individual constraint procedures should call these */ /* - These are called before/instead of individual constraint */
/* get/set procedures when OWNERSPACE or TARGETSPACE are chosen */
/* - They are only called from Constraint_g/setData
/******************************************************************************/ /******************************************************************************/
static PyObject *constspace_getter( BPy_Constraint * self, int type ) static PyObject *constspace_getter( BPy_Constraint * self, int type )
@@ -528,7 +530,7 @@ static int constspace_setter( BPy_Constraint *self, int type, PyObject *value )
case CONSTRAINT_TYPE_TRANSFORM: case CONSTRAINT_TYPE_TRANSFORM:
{ {
Object *tar; Object *tar;
char subtarget[32]; char *subtarget;
tar= get_constraint_target(con, &subtarget); tar= get_constraint_target(con, &subtarget);