forked from bartvdbraak/blender
Fully disable AUD's FFTW3 usage.
This commit is contained in:
parent
2d9be2226a
commit
1de1d6537e
@ -57,6 +57,7 @@ ifeq ($(WITH_SNDFILE),true)
|
|||||||
DIRS += sndfile
|
DIRS += sndfile
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Not in use currently, see also source/Makefile and r31375
|
||||||
#ifeq ($(WITH_FFTW3),true)
|
#ifeq ($(WITH_FFTW3),true)
|
||||||
# DIRS += fftw
|
# DIRS += fftw
|
||||||
#endif
|
#endif
|
||||||
|
@ -129,9 +129,10 @@ endif
|
|||||||
ifeq ($(WITH_SNDFILE),true)
|
ifeq ($(WITH_SNDFILE),true)
|
||||||
COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
|
COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
|
||||||
endif
|
endif
|
||||||
ifeq ($(WITH_FFTW3),true)
|
# Not in use currently, see also intern/audaspace/Makefile and r31375
|
||||||
COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a
|
#ifeq ($(WITH_FFTW3),true)
|
||||||
endif
|
# COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a
|
||||||
|
#endif
|
||||||
COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
|
COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
|
||||||
COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
|
COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
|
||||||
COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
|
COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
|
||||||
|
@ -1939,11 +1939,10 @@ static void make_bevel_list_3D_tangent(BevList *bl)
|
|||||||
|
|
||||||
/* make perpendicular, modify tan in place, is ok */
|
/* make perpendicular, modify tan in place, is ok */
|
||||||
float cross_tmp[3];
|
float cross_tmp[3];
|
||||||
float zero[3] = {0,0,0};
|
|
||||||
|
|
||||||
cross_v3_v3v3(cross_tmp, bevp1->tan, bevp1->dir);
|
cross_v3_v3v3(cross_tmp, bevp1->tan, bevp1->dir);
|
||||||
normalize_v3(cross_tmp);
|
normalize_v3(cross_tmp);
|
||||||
tri_to_quat( bevp1->quat,zero, cross_tmp, bevp1->tan); /* XXX - could be faster */
|
tri_to_quat( bevp1->quat, (float [3]){0,0,0}, cross_tmp, bevp1->tan); /* XXX - could be faster */
|
||||||
|
|
||||||
bevp0= bevp1;
|
bevp0= bevp1;
|
||||||
bevp1= bevp2;
|
bevp1= bevp2;
|
||||||
|
@ -502,8 +502,7 @@ static void layerInterp_mdisps(void **UNUSED(sources), float *UNUSED(weights),
|
|||||||
|
|
||||||
/* Initialize the destination */
|
/* Initialize the destination */
|
||||||
for(i = 0; i < d->totdisp; ++i) {
|
for(i = 0; i < d->totdisp; ++i) {
|
||||||
float z[3] = {0,0,0};
|
zero_v3(d->disps[i]);
|
||||||
copy_v3_v3(d->disps[i], z);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* For now, some restrictions on the input */
|
/* For now, some restrictions on the input */
|
||||||
|
@ -1007,8 +1007,7 @@ void pdDoEffectors(ListBase *effectors, ListBase *colliders, EffectorWeights *we
|
|||||||
else if(eff->pd->forcefield == PFIELD_TEXTURE)
|
else if(eff->pd->forcefield == PFIELD_TEXTURE)
|
||||||
do_texture_effector(eff, &efd, point, force);
|
do_texture_effector(eff, &efd, point, force);
|
||||||
else {
|
else {
|
||||||
float temp1[3]={0,0,0}, temp2[3];
|
float temp1[3]={force[0], force[1], force[2]}, temp2[3];
|
||||||
VECCOPY(temp1, force);
|
|
||||||
|
|
||||||
do_physical_effector(eff, &efd, point, force);
|
do_physical_effector(eff, &efd, point, force);
|
||||||
|
|
||||||
|
@ -6139,8 +6139,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
|
|||||||
/* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */
|
/* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */
|
||||||
/* but, we also dont draw names for sets or duplicators */
|
/* but, we also dont draw names for sets or duplicators */
|
||||||
if(flag == 0) {
|
if(flag == 0) {
|
||||||
float zero[3]= {0,0,0};
|
view3d_cached_text_draw_add((float [3]){0,0,0}, ob->id.name+2, 10, 0);
|
||||||
view3d_cached_text_draw_add(zero, ob->id.name+2, 10, 0);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
|
/*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
|
||||||
|
@ -212,9 +212,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
|
|||||||
float totlen = len_v3(mtx_tx[3]);
|
float totlen = len_v3(mtx_tx[3]);
|
||||||
|
|
||||||
if(totlen != 0.0f) {
|
if(totlen != 0.0f) {
|
||||||
float zero[3]={0.0f, 0.0f, 0.0f};
|
|
||||||
float cp[3];
|
float cp[3];
|
||||||
screw_ofs= closest_to_line_v3(cp, mtx_tx[3], zero, axis_vec);
|
screw_ofs= closest_to_line_v3(cp, mtx_tx[3], (float []){0,0,0}, axis_vec);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
screw_ofs= 0.0f;
|
screw_ofs= 0.0f;
|
||||||
|
Loading…
Reference in New Issue
Block a user