Fully disable AUD's FFTW3 usage.

diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile
index c1a613af1ae9792f55396115aa07fa2ea4832b9b..2f7bd8c79ff7a67e424bc625f8ea20a8edd67a57 100644 (file)
--- a/intern/audaspace/Makefile
+++ b/intern/audaspace/Makefile
@@ -57,6 +57,7 @@ ifeq ($(WITH_SNDFILE),true)
   DIRS += sndfile
 endif
 
   DIRS += sndfile
 endif
 

+# Not in use currently, see also source/Makefile and r31375

 #ifeq ($(WITH_FFTW3),true)
 #  DIRS += fftw
 #endif
 #ifeq ($(WITH_FFTW3),true)
 #  DIRS += fftw
 #endif

diff --git a/source/Makefile b/source/Makefile
index 9768dbc00109fa8d93d2222508f6a5bcc5857ae8..637fbf3687131d8305c95ac4b277610eec112a66 100644 (file)
--- a/source/Makefile
+++ b/source/Makefile
@@ -129,9 +129,10 @@ endif
 ifeq ($(WITH_SNDFILE),true)
     COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a
 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
 COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
 COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
 COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index a7dd80bff4d10701402fa5e619e2e4f96a2b1bce..06ba066efddd9228fc94bdbe6f2b9e91120a437c 100644 (file)
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -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];
 
                /* 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);
 
                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;
 
                bevp0= bevp1;
                bevp1= bevp2;

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 9c4f0d790cab0c04c11f44eda066c4a49f59c161..3eec761169729c1a27e36120a62ab73c859710fe 100644 (file)
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -502,8 +502,7 @@ static void layerInterp_mdisps(void **UNUSED(sources), float *UNUSED(weights),
 
        /* Initialize the destination */
        for(i = 0; i < d->totdisp; ++i) {
 
        /* 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 */
        }
 
        /* For now, some restrictions on the input */

diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 70e814ef9560ca0ea9703367825ee91ee47ac357..47606c399376a9b910cfd44b41e573759e99a949 100644 (file)
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -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 {
                                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);
                                        
 
                                        do_physical_effector(eff, &efd, point, force);
                                        

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index bc340ef5b4b13a70af36eb7f2abbe9da52dfdf03..171c5a311c1b43541df37b03ced9cb94e1c06794 100644 (file)
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -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) {
                                /* 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);*/
                                }
                        }
                        /*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/

diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 668f0a086d10a3b1906ceb13f9db9b7c108658d9..b71249880a697957900f8c2efd090f014961e521 100644 (file)
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -212,9 +212,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
                        float totlen = len_v3(mtx_tx[3]);
 
                        if(totlen != 0.0f) {
                        float totlen = len_v3(mtx_tx[3]);
 
                        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 {
                                screw_ofs= 0.0f;
                        }
                        else {
                                screw_ofs= 0.0f;