From 06167a0ec76f437329d9d32236c1cc0af31b6582 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 7 Apr 2010 17:30:17 +0000 Subject: [PATCH] Shouldn't do so without actually trying my fix first, though --- panda/src/gobj/shader.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/panda/src/gobj/shader.cxx b/panda/src/gobj/shader.cxx index 8d7b3ae03b..d60dc87790 100755 --- a/panda/src/gobj/shader.cxx +++ b/panda/src/gobj/shader.cxx @@ -469,10 +469,9 @@ cp_optimize_mat_spec(ShaderMatSpec &spec) { } //////////////////////////////////////////////////////////////////// -// Function: Shader::recurse_parameters +// Function: Shader::cg_recurse_parameters // Access: Public // Description: -// //////////////////////////////////////////////////////////////////// void Shader::cg_recurse_parameters(CGparameter parameter, const ShaderType& type, bool& success) { @@ -492,7 +491,7 @@ void Shader::cg_recurse_parameters(CGparameter parameter, if ((vbl==CG_VARYING)||(vbl==CG_UNIFORM)){ switch (cgGetParameterType(parameter)) { case CG_STRUCT: - recurse_parameters( + cg_recurse_parameters( cgGetFirstStructParameter(parameter),type,success); break; case CG_ARRAY: