[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36341] branches/particles-2010/source/ blender/blenkernel/intern/node.c: Small fix for merge error.
Lukas Toenne
lukas.toenne at googlemail.com
Tue Apr 26 15:36:21 CEST 2011
Revision: 36341
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36341
Author: lukastoenne
Date: 2011-04-26 13:36:21 +0000 (Tue, 26 Apr 2011)
Log Message:
-----------
Small fix for merge error.
Modified Paths:
--------------
branches/particles-2010/source/blender/blenkernel/intern/node.c
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/node.c 2011-04-26 13:24:20 UTC (rev 36340)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c 2011-04-26 13:36:21 UTC (rev 36341)
@@ -499,7 +499,7 @@
ntype= node_get_type(ntree, ntemp->type);
if(ntype == NULL) {
- printf("nodeAddNodeType() error: '%d' type invalid\n", type);
+ printf("nodeAddNodeType() error: '%d' type invalid\n", ntemp->type);
return NULL;
}
/* validity check */
More information about the Bf-blender-cvs
mailing list