[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49067] trunk/blender: wrong name in last commit & update man page

[Campbell Barton]

Revision: 49067
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49067
Author:   campbellbarton
Date:     2012-07-19 13:06:39 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
wrong name in last commit & update man page

Modified Paths:
--------------
    trunk/blender/doc/manpage/blender.1
    trunk/blender/intern/cycles/render/graph.cpp

Modified: trunk/blender/doc/manpage/blender.1
===================================================================
(Binary files differ)

Modified: trunk/blender/intern/cycles/render/graph.cpp
===================================================================
--- trunk/blender/intern/cycles/render/graph.cpp	2012-07-19 13:04:43 UTC (rev 49066)
+++ trunk/blender/intern/cycles/render/graph.cpp	2012-07-19 13:06:39 UTC (rev 49067)
@@ -188,7 +188,7 @@
 		/* for closures we can't do automatic conversion */
 		if(from->type == SHADER_SOCKET_CLOSURE || to->type == SHADER_SOCKET_CLOSURE) {
 			fprintf(stderr, "ShaderGraph connect: can only connect closure to closure "
-			        "(ShaderNode:%s, ShaderOutput:%s , type:%d -> to ShaderNode:%s, ShaderOutput:%s, type:%d).\n",
+			        "(ShaderNode:%s, ShaderOutput:%s , type:%d -> to ShaderNode:%s, ShaderInput:%s, type:%d).\n",
 			        from->parent->name.c_str(), from->name, (int)from->type,
 			        to->parent->name.c_str(),   to->name,   (int)to->type);
 			return;