minor warning fixes, also correct some float -> double promotions in shadeoutput.c

[blender.git] / source / blender / blenkernel / intern / nla.c

diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 25f824bba19dce5ca4996a2bc5b84ecc4b10d9b0..53ccd55bde8e32e5d8d64f8272c07929f34a3fb8 100644 (file)
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -341,7 +341,7 @@ NlaStrip *add_nlastrip_to_stack (AnimData *adt, bAction *act)
 }
 
 /* Add a NLA Strip referencing the given speaker's sound */
 }
 
 /* Add a NLA Strip referencing the given speaker's sound */

-NlaStrip *add_nla_soundstrip (Scene *scene, Speaker *speaker)
+NlaStrip *add_nla_soundstrip (Scene *UNUSED(scene), Speaker *speaker)

 {
        NlaStrip *strip = MEM_callocN(sizeof(NlaStrip), "NlaSoundStrip");
        
 {
        NlaStrip *strip = MEM_callocN(sizeof(NlaStrip), "NlaSoundStrip");
        


@@ -359,6 +359,8 @@ NlaStrip *add_nla_soundstrip (Scene *scene, Speaker *speaker)
 #endif
        {
                strip->end = 10.0f;
 #endif
        {
                strip->end = 10.0f;

+               /* quiet compiler warnings */
+               (void)speaker;

        }
        
        /* general settings */
        }
        
        /* general settings */