Move SGReadFileCallback from model.cxx to public class ModelRegistry

[simgear.git] / simgear / screen / shader.cpp

diff --git a/simgear/screen/shader.cpp b/simgear/screen/shader.cpp
index 16f89b59e8014f74c034b86613968ddb0b672056..e307d9952af6007ea2a31e9b85710bb440cd703b 100644 (file)
--- a/simgear/screen/shader.cpp
+++ b/simgear/screen/shader.cpp
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -483,7 +483,7 @@ void Shader::bind(const float *v,...) {
     }
        const float *value = v;
        va_list args;
-       va_start(args,value);
+       va_start(args,v);
        for(int i = 0; i < (int)parameters.size(); i++) {
                if( vertex_target ) {
                        glProgramLocalParameter4fvPtr( vertex_target, parameters[i].location, value);
@@ -549,7 +549,7 @@ void Shader::setParameter(const char *name,const float *value) {
 void Shader::setParameters(const float *v,...) {
        const float *value = v;
        va_list args;
-       va_start(args,value);
+       va_start(args,v);
        for(int i = 0; i < (int)parameters.size(); i++) {
                if( vertex_target ) {
                        glProgramLocalParameter4fvPtr( vertex_target, parameters[i].location, value);