[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39861] trunk/blender: fix for error in recent commit, when audaspace is enabled

[Campbell Barton]

Revision: 39861
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39861
Author:   campbellbarton
Date:     2011-09-02 04:34:58 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
fix for error in recent commit, when audaspace is enabled

Modified Paths:
--------------
    trunk/blender/intern/tools/credits_svn_gen.py
    trunk/blender/source/blender/blenkernel/intern/nla.c

Modified: trunk/blender/intern/tools/credits_svn_gen.py
===================================================================
--- trunk/blender/intern/tools/credits_svn_gen.py	2011-09-02 03:57:37 UTC (rev 39860)
+++ trunk/blender/intern/tools/credits_svn_gen.py	2011-09-02 04:34:58 UTC (rev 39861)
@@ -218,7 +218,6 @@
     "zuster": "Daniel Dunbar",
 
     # TODO, find remaining names
-
     "cmccad": "",
     "eeshlo": "",
     "frank": "",
@@ -409,7 +408,7 @@
 
     # write out the wiki page
     # sort by name
-    file = open("/credits.html", 'w')
+    file = open("credits.html", 'w')
 
     file.write("<h3>Individual Contributors</h3>\n\n")
 

Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c	2011-09-02 03:57:37 UTC (rev 39860)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c	2011-09-02 04:34:58 UTC (rev 39861)
@@ -341,7 +341,7 @@
 }
 
 /* Add a NLA Strip referencing the given speaker's sound */
-NlaStrip *add_nla_soundstrip (Scene *UNUSED(scene), Speaker *speaker)
+NlaStrip *add_nla_soundstrip (Scene *scene, Speaker *speaker)
 {
 	NlaStrip *strip = MEM_callocN(sizeof(NlaStrip), "NlaSoundStrip");
 	
@@ -360,6 +360,7 @@
 	{
 		strip->end = 10.0f;
 		/* quiet compiler warnings */
+		(void)scene;
 		(void)speaker;
 	}