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

Fully disable AUD's FFTW3 usage.

Browse Source
This commit is contained in:
Guillermo S. Romero 2010-10-24 00:09:23 +00:00
parent 2d9be2226a
commit 1de1d6537e
7 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/audaspace/Makefile
View File

@ -57,6 +57,7 @@ ifeq ($(WITH_SNDFILE),true)
DIRS += sndfile
endif
# Not in use currently, see also source/Makefile and r31375
#ifeq ($(WITH_FFTW3),true)
# DIRS += fftw
#endif

7
source/Makefile
View File

@ -129,9 +129,10 @@ endif
ifeq ($(WITH_SNDFILE),true)
COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
endif
ifeq ($(WITH_FFTW3),true)
COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a
endif
# Not in use currently, see also intern/audaspace/Makefile and r31375
#ifeq ($(WITH_FFTW3),true)
# COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a
#endif
COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a

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

@ -1939,11 +1939,10 @@ static void make_bevel_list_3D_tangent(BevList *bl)
/* make perpendicular, modify tan in place, is ok */
float cross_tmp[3];
float zero[3] = {0,0,0};
cross_v3_v3v3(cross_tmp, bevp1->tan, bevp1->dir);
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;
bevp1= bevp2;

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

@ -502,8 +502,7 @@ static void layerInterp_mdisps(void **UNUSED(sources), float *UNUSED(weights),
/* Initialize the destination */
for(i = 0; i < d->totdisp; ++i) {
float z[3] = {0,0,0};
copy_v3_v3(d->disps[i], z);
zero_v3(d->disps[i]);
}
/* For now, some restrictions on the input */

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

@ -1007,8 +1007,7 @@ void pdDoEffectors(ListBase *effectors, ListBase *colliders, EffectorWeights *we
else if(eff->pd->forcefield == PFIELD_TEXTURE)
do_texture_effector(eff, &efd, point, force);
else {
float temp1[3]={0,0,0}, temp2[3];
VECCOPY(temp1, force);
float temp1[3]={force[0], force[1], force[2]}, temp2[3];
do_physical_effector(eff, &efd, point, force);

3
source/blender/editors/space_view3d/drawobject.c
View File

@ -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 */
/* but, we also dont draw names for sets or duplicators */
if(flag == 0) {
float zero[3]= {0,0,0};
view3d_cached_text_draw_add(zero, ob->id.name+2, 10, 0);
view3d_cached_text_draw_add((float [3]){0,0,0}, ob->id.name+2, 10, 0);
}
}
/*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/

3
source/blender/modifiers/intern/MOD_screw.c
View File

@ -212,9 +212,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
float totlen = len_v3(mtx_tx[3]);
if(totlen != 0.0f) {
float zero[3]={0.0f, 0.0f, 0.0f};
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 {
screw_ofs= 0.0f;